diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2012-04-19 14:48:34 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-19 19:46:07 +0200 |
| commit | 8e053a5dfc9b4c8f100b1e77335439774f52fc61 (patch) | |
| tree | 50919a59a4901c603ce20177becbbc6d3d923331 /qmake | |
| parent | 93b34badfec4f602ccf482922bf04180d220c5ec (diff) | |
fix static library names when generating .pc files for pkgconfig
219a688ac17052e4bb3aac9ff8a813e3f4d8da01 added the version extension
which only occurs on the DLL import library.
Change-Id: Ie913adf039d7f3a9aadf43f4af014289a8aeacbe
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Hib Eris <hib@hiberis.nl>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 1904b8f6c6..d37089ee35 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3251,7 +3251,8 @@ MakefileGenerator::writePkgConfigFile() } else { pkgConfiglibDir = "-L${libdir}"; pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length()); - pkgConfiglibName += project->first("TARGET_VERSION_EXT"); + if (project->isActiveConfig("shared")) + pkgConfiglibName += project->first("TARGET_VERSION_EXT"); } t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl; |