diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-01-31 16:40:49 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-02 17:47:52 (GMT) |
| commit | 215458a4398dd47e7f6e5d0d56e7ac2cb819727d (patch) | |
| tree | 71da240c7516cec82c1b36f017d27e974fbcb6cc | |
| parent | 33179842341fcf7d42e74f62a600470aed6b08a1 (diff) | |
| download | Qt-215458a4398dd47e7f6e5d0d56e7ac2cb819727d.zip Qt-215458a4398dd47e7f6e5d0d56e7ac2cb819727d.tar.gz Qt-215458a4398dd47e7f6e5d0d56e7ac2cb819727d.tar.bz2 | |
Windows configure: make -mp affect the Qt build itself
Before -mp and -no-mp affected only projects built with Qt.
There was no way to turn off msvc_mp for the Qt build.
Qt projects can add msvc_mp themselves.
Task-number: QTBUG-23929
Change-Id: I2f9f038ae64acec545fcd038842bba92a8736af4
(cherry picked from commit 41a5ca35591a735d9f07e2335d5827763d52c1f4)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | tools/configure/configureapp.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 514ba3e..4ef61eb 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2672,6 +2672,9 @@ void Configure::generateOutputVars() qmakeConfig += dictionary[ "BUILD" ]; dictionary[ "QMAKE_OUTDIR" ] = dictionary[ "BUILD" ]; + if (dictionary["MSVC_MP"] == "yes") + qmakeConfig += "msvc_mp"; + if (dictionary[ "SHARED" ] == "yes") { QString version = dictionary[ "VERSION" ]; if (!version.isEmpty()) { @@ -2923,7 +2926,7 @@ void Configure::generateCachefile() for (QStringList::Iterator var = qmakeVars.begin(); var != qmakeVars.end(); ++var) { cacheStream << (*var) << endl; } - cacheStream << "CONFIG += " << qmakeConfig.join(" ") << " incremental msvc_mp create_prl link_prl depend_includepath QTDIR_build" << endl; + cacheStream << "CONFIG += " << qmakeConfig.join(" ") << " incremental create_prl link_prl depend_includepath QTDIR_build" << endl; QStringList buildParts; buildParts << "libs" << "tools" << "examples" << "demos" << "docs" << "translations"; @@ -2986,8 +2989,6 @@ void Configure::generateCachefile() if (dictionary[ "LTCG" ] == "yes") configStream << " ltcg"; - if (dictionary[ "MSVC_MP" ] == "yes") - configStream << " msvc_mp"; if (dictionary[ "STL" ] == "yes") configStream << " stl"; if (dictionary[ "EXCEPTIONS" ] == "yes") |