summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-02-28 14:25:24 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-01 20:40:04 (GMT)
commite80d7bb8bb7fcecab8f98a614e34d4e3929d5ec4 (patch)
tree0f0e9d867ed04e6d0b57244eca1f2de2d8e3968e /tools
parent942e1ea5de0fe7fa1afd5ac4fb484be0d157cf95 (diff)
downloadQt-e80d7bb8bb7fcecab8f98a614e34d4e3929d5ec4.zip
Qt-e80d7bb8bb7fcecab8f98a614e34d4e3929d5ec4.tar.gz
Qt-e80d7bb8bb7fcecab8f98a614e34d4e3929d5ec4.tar.bz2
unmess CONFIG/QT_CONFIG static/shared
bring it to the state of 5.0.2: both QT_CONFIG and CONFIG in qconfig.pri contain the respective flag, so it is a) visible how qt was built and b) user code has a consistent default. before, on windows we had it only in qconfig.pri's CONFIG (so it was harder to find the qt config), and on unix we had it only in .qmake.cache's CONFIG (so it was impossible to find the qt config in a clean way, and there was no default (other than some arbitrary mess inside qmake itself)). Change-Id: Iad06de8c4435cec3e1407babde037ac96cb5bf66 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 5d64be4..73dc190 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3247,10 +3247,13 @@ void Configure::generateCachefile()
QTextStream configStream(&configFile);
configStream << "CONFIG+= ";
configStream << dictionary[ "BUILD" ];
- if (dictionary[ "SHARED" ] == "yes")
+ if (dictionary[ "SHARED" ] == "yes") {
configStream << " shared";
- else
+ qtConfig << "shared";
+ } else {
configStream << " static";
+ qtConfig << "static";
+ }
if (dictionary[ "LTCG" ] == "yes")
configStream << " ltcg";