summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-07-06 19:39:26 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-09 08:26:23 +0200
commit77b293d2ff5ae859535c890cd2a5ee8cda0757d1 (patch)
treea7f081fe01889d8507c3d17a1bc0768c13c10e17 /tools
parent0404bd1bcd246feba4ee6057aa6e424a3d9bf004 (diff)
make QT_BUILD_PARTS setting in qmodule.pri additive
that way it is actually possible to add additional parts from the qmake command line. Change-Id: I42e0b58424292cebafb57538a879204d370397bb Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 26160976bb..d311ff6573 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2672,7 +2672,7 @@ void Configure::generateCachefile()
moduleStream << "#paths" << endl;
moduleStream << "QT_BUILD_TREE = " << formatPath(dictionary["QT_BUILD_TREE"]) << endl;
moduleStream << "QT_SOURCE_TREE = " << formatPath(dictionary["QT_SOURCE_TREE"]) << endl;
- moduleStream << "QT_BUILD_PARTS = " << buildParts.join(" ") << endl << endl;
+ moduleStream << "QT_BUILD_PARTS += " << buildParts.join(" ") << endl << endl;
if (dictionary["QT_EDITION"] != "QT_EDITION_OPENSOURCE")
moduleStream << "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" << endl;