summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-02-15 19:28:28 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-18 15:52:43 +0100
commit489d8a0627c46092d20f476d5521ecafd42e5ce5 (patch)
tree60e78d7ad6044def49a6516e1f3e178e58986c7f /tools/configure
parent2e4ce301f98d3f463a7151c21dc8cc407cd8702c (diff)
add QT_CONFIG's static/shared to CONFIG on startup
... instead of as a fallback in default_post. it was this way in qt4, and it requires less code to be written in the end. we are already doing it for debug/release as well. Change-Id: I6e02849d61d14a18375cf64a5990768931ebac48 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/configureapp.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 5fe1e029fb..966571be77 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3029,6 +3029,7 @@ void Configure::generateQConfigPri()
configStream << "CONFIG+= ";
configStream << dictionary[ "BUILD" ];
+ configStream << (dictionary[ "SHARED" ] == "no" ? " static" : " shared");
if (dictionary[ "LTCG" ] == "yes")
configStream << " ltcg";