summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Sorvig <msorvig@trolltech.com>2011-03-16 11:13:20 (GMT)
committerMorten Sorvig <msorvig@trolltech.com>2011-03-16 11:13:20 (GMT)
commit8ec40d6de585315e0a4bd4f533a9113e836c8436 (patch)
tree637528b48c10b03e1f135296995a499f7cf08403
parentf0fc5b8a9ab3f4bca0022771e576722d63a78ca2 (diff)
downloadQt-8ec40d6de585315e0a4bd4f533a9113e836c8436.zip
Qt-8ec40d6de585315e0a4bd4f533a9113e836c8436.tar.gz
Qt-8ec40d6de585315e0a4bd4f533a9113e836c8436.tar.bz2
Rename qconfig-minimal-system-depenencies.h
Rename to qconfig.nacl.h. This reflects that the config now enables all dependencies NaCl can support, not necessarily the minimal set.
-rwxr-xr-xconfigure4
-rw-r--r--src/corelib/global/qconfig-nacl.h (renamed from src/corelib/global/qconfig-minimal-system-dependencies.h)0
2 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index ffc93d8..2ea3689 100755
--- a/configure
+++ b/configure
@@ -960,8 +960,8 @@ if [ "$CFG_EMBEDDED" = "nacl" ]; then
PLATFORM_QPA=yes
echo "-fast"
OPT_FAST=yes
- echo "-qconfig minimal-system-dependencies"
- CFG_QCONFIG=minimal-system-dependencies
+ echo "-qconfig nacl"
+ CFG_QCONFIG=nacl
if [ `uname` = "Linux" ]; then
I_FLAGS="$I_FLAGS -I${CFG_NACL_PATH}/toolchain/linux_x86/sdk/nacl-sdk/include"
diff --git a/src/corelib/global/qconfig-minimal-system-dependencies.h b/src/corelib/global/qconfig-nacl.h
index 63319b9..63319b9 100644
--- a/src/corelib/global/qconfig-minimal-system-dependencies.h
+++ b/src/corelib/global/qconfig-nacl.h