diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-06 19:39:26 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-09 08:26:23 +0200 |
| commit | 77b293d2ff5ae859535c890cd2a5ee8cda0757d1 (patch) | |
| tree | a7f081fe01889d8507c3d17a1bc0768c13c10e17 | |
| parent | 0404bd1bcd246feba4ee6057aa6e424a3d9bf004 (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>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -5849,7 +5849,7 @@ fi QTMODULE="$outpath/mkspecs/qmodule.pri" echo "CONFIG += $QMAKE_CONFIG create_prl link_prl" >> "$QTMODULE.tmp" -echo "QT_BUILD_PARTS = $CFG_BUILD_PARTS" >> "$QTMODULE.tmp" +echo "QT_BUILD_PARTS += $CFG_BUILD_PARTS" >> "$QTMODULE.tmp" # Ensure we can link to uninistalled libraries if [ "$BUILD_ON_MAC" != "yes" ] && [ "$XPLATFORM_MINGW" != "yes" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then 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; |