1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not write 'Libs:' into .pc files if TEMPLATE is not 'lib'

Browse Source 
Especially for header modules we don't want a 'Libs:' entry in their
.pc file.

Task-number: QTBUG-75901
Change-Id: I39037d3132e39dd360532e1425f794ebec28e0bd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Joerg Bornemann 2019-06-03 14:52:49 +02:00
parent 60136b1a84
commit c64f8ca232
1 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/makefile.cpp
View File

@ -3359,6 +3359,7 @@ MakefileGenerator::writePkgConfigFile()
if (!version.isEmpty()) if (!version.isEmpty())
t << "Version: " << version << endl; t << "Version: " << version << endl;
if (project->first("TEMPLATE") == "lib") {
// libs // libs
t << "Libs: "; t << "Libs: ";
QString pkgConfiglibName; QString pkgConfiglibName;
@ -3396,6 +3397,7 @@ MakefileGenerator::writePkgConfigFile()
t << ' ' << fixLibFlags((*it).toKey()).join(' '); t << ' ' << fixLibFlags((*it).toKey()).join(' ');
t << endl; t << endl;
} }
}
// flags // flags
// ### too many // ### too many