summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-10-23 21:06:08 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-02 18:07:35 +0100
commit80439fbd823e9b6922b1dd9ff45824ec9a49ef2c (patch)
tree846c34ce8252d8b09e03f05dc11b5bbc7b025d07
parentbc64a7a6f743688044505a3480bbf02ca0e71d0d (diff)
move invariant CONFIG flags out of the configures
we now have qt_build_config.prf which can contain static code. Change-Id: I3f0ae142fdc5ffb4e1d25e628e809ba15b5f0ac4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rwxr-xr-xconfigure2
-rw-r--r--mkspecs/features/qt_build_config.prf2
-rw-r--r--tools/configure/configureapp.cpp3
3 files changed, 4 insertions, 3 deletions
diff --git a/configure b/configure
index 2c6cc4828e..4a4b48b1aa 100755
--- a/configure
+++ b/configure
@@ -6074,7 +6074,7 @@ fi
#-------------------------------------------------------------------------------
QTMODULE="$outpath/mkspecs/qmodule.pri"
-echo "CONFIG += $QMAKE_CONFIG create_prl link_prl no_private_qt_headers_warning QTDIR_build" >> "$QTMODULE.tmp"
+echo "CONFIG += $QMAKE_CONFIG" >> "$QTMODULE.tmp"
echo "QT_BUILD_PARTS += $CFG_BUILD_PARTS" >> "$QTMODULE.tmp"
if [ -n "$QT_CFLAGS_PSQL" ]; then
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
index 01605da5e8..786275dd8a 100644
--- a/mkspecs/features/qt_build_config.prf
+++ b/mkspecs/features/qt_build_config.prf
@@ -25,6 +25,8 @@ mac {
}
}
+CONFIG += create_prl link_prl no_private_qt_headers_warning QTDIR_build
+
# Qt modules get compiled without exceptions enabled by default.
# However, testcases should be still built with exceptions.
CONFIG += exceptions_off testcase_exceptions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index ca671b53a0..d2046413cf 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2750,8 +2750,7 @@ void Configure::generateCachefile()
if (!dictionary["DECORATIONS"].isEmpty())
moduleStream << "decorations += "<<dictionary["DECORATIONS"]<<endl;
- moduleStream << "CONFIG += " << qmakeConfig.join(' ')
- << " create_prl link_prl no_private_qt_headers_warning QTDIR_build";
+ moduleStream << "CONFIG += " << qmakeConfig.join(' ');
if (dictionary[ "SSE2" ] == "yes")
moduleStream << " sse2";
if (dictionary[ "SSE3" ] == "yes")