diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-12-14 11:33:15 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-21 22:58:50 +0100 |
| commit | 3225942dbb7faaeff477e137af9c3d78fcaf518e (patch) | |
| tree | 09654c68a4337f8a670fc24fe6a51a6da164fba1 /tools | |
| parent | cd796404f17e8ecfa32e108de47709e41072542f (diff) | |
configure[.exe]: use create_prl, link_prl for all modules
These should go into qmodule.pri, rather than .qmake.cache, as they
make sense for all Qt modules - not only qtbase.
Fixes link failure when building qtdeclarative with jom on Windows.
Change-Id: I3e8b207e1808cb23af58b865a160c2fafa906288
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index a831825346..8ae06c3c8a 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2666,7 +2666,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 no_private_qt_headers_warning QTDIR_build" << endl; + cacheStream << "CONFIG += " << qmakeConfig.join(" ") << " incremental msvc_mp depend_includepath no_private_qt_headers_warning QTDIR_build" << endl; cacheStream.flush(); cacheFile.close(); @@ -2740,7 +2740,9 @@ void Configure::generateCachefile() moduleStream << "decorations += "<<dictionary["DECORATIONS"]<<endl; if (!dictionary["QMAKE_RPATHDIR"].isEmpty()) - moduleStream << "QMAKE_RPATHDIR += "<<dictionary["QMAKE_RPATHDIR"]; + moduleStream << "QMAKE_RPATHDIR += "<<dictionary["QMAKE_RPATHDIR"]<<endl; + + moduleStream << "CONFIG += create_prl link_prl" << endl; moduleStream.flush(); moduleFile.close(); |