AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

write Libs.private to .pc files only in static builds

Browse Source 
projects using a dynamic build are not supposed to access this variable
anyway.

Task-number: QTBUG-51598
Change-Id: I81b55ea9ba460b80919f40ed7fe3d52129636b9e
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Jonathan Liu <net147@gmail.com>
This commit is contained in:
Oswald Buddenhagen 2017-04-10 13:10:56 +02:00
parent 850c5dbcd3
commit 05b3295a57
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
qmake/generators/makefile.cpp
View File

@ -3310,19 +3310,19 @@ MakefileGenerator::writePkgConfigFile()
} }
t << shellQuote(pkgConfiglibName) << " \n"; t << shellQuote(pkgConfiglibName) << " \n";
ProStringList libs; if (project->isActiveConfig("staticlib")) {
if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS")) { ProStringList libs;
libs = project->values("QMAKE_INTERNAL_PRL_LIBS"); if (!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
} else { libs = project->values("QMAKE_INTERNAL_PRL_LIBS");
libs << "QMAKE_LIBS"; //obvious one 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;
} }
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;
// flags // flags
// ### too many // ### too many