diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-12 20:08:56 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-12 20:08:56 +0200 |
| commit | 94c576cf6607d3e9880fdaf6c8a51216bf2d2147 (patch) | |
| tree | 32e42bdb8bcb869c894023f9494c2e2df310d585 /qmake | |
| parent | 2ad7f6ddf5042d7442c97a89b083ca2853cf5721 (diff) | |
| parent | e893e657e5c976f96e7e627ca90531934129bf4b (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I3bd83a839b16822035ed56a5cffe77bd6bc3f08d
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 5f3b8c9047..b97dc7128a 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3311,19 +3311,19 @@ MakefileGenerator::writePkgConfigFile() } t << shellQuote(pkgConfiglibName) << " \n"; - ProStringList libs; - if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS")) { - libs = project->values("QMAKE_INTERNAL_PRL_LIBS"); - } else { - libs << "QMAKE_LIBS"; //obvious one - } - libs << "QMAKE_LIBS_PRIVATE"; - libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread? - t << "Libs.private: "; - for (ProStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it) { - t << fixLibFlags((*it).toKey()).join(' ') << ' '; + if (project->isActiveConfig("staticlib")) { + ProStringList libs; + if (!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS")) + libs = project->values("QMAKE_INTERNAL_PRL_LIBS"); + else + libs << "QMAKE_LIBS"; //obvious one + libs << "QMAKE_LIBS_PRIVATE"; + libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread? + t << "Libs.private:"; + for (ProStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it) + t << ' ' << fixLibFlags((*it).toKey()).join(' '); + t << endl; } - t << endl; // flags // ### too many |