summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorPeter Kümmel <syntheticpp@gmx.net>2015-10-31 17:23:23 +0100
committerPeter Kümmel <syntheticpp@gmx.net>2015-11-03 17:03:53 +0000
commit7c19b28c58cc992f5c041b8f6369d92dcc138917 (patch)
tree49abe3d5702f373788e81dbcd767df8dc9d278ba /tools
parent6c84f48da84d40d22de2407629693d6754e7ec4a (diff)
configure: set ltcg only for Qt modules
Adding ltcg to qconfig.pri enables ltcg unconditionally for everyone using msvc. Change-Id: Ie1d11612a10fcdcb27de41664141e661a17323dd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 6c3217baeb..5ddb3cb489 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3136,7 +3136,7 @@ void Configure::generateOutputVars()
void Configure::generateCachefile()
{
- // Generate qmodule.pri
+ // Generate qmodule.pri, which is loaded only by Qt modules
{
FileWriter moduleStream(buildPath + "/mkspecs/qmodule.pri");
@@ -3204,6 +3204,8 @@ void Configure::generateCachefile()
moduleStream << " largefile";
if (dictionary[ "STRIP" ] == "no")
moduleStream << " nostrip";
+ if (dictionary[ "LTCG" ] == "yes")
+ moduleStream << " ltcg";
moduleStream << endl;
for (QStringList::Iterator var = qmakeVars.begin(); var != qmakeVars.end(); ++var)
@@ -3491,8 +3493,6 @@ void Configure::generateQConfigPri()
if (dictionary["STATIC_RUNTIME"] == "yes")
configStream << " static_runtime";
- if (dictionary[ "LTCG" ] == "yes")
- configStream << " ltcg";
if (dictionary[ "RTTI" ] == "yes")
configStream << " rtti";
if (dictionary["INCREDIBUILD_XGE"] == "yes")