diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2012-04-19 12:48:34 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-20 06:19:11 (GMT) |
| commit | 51a2b0fde9bf635482fd2463b901139c82ed0dc4 (patch) | |
| tree | df360c857781cac3ae7b15fd277a5849ed203876 /qmake/generators | |
| parent | 235595362f40bdb0a6f4671afc5b370e3ec73675 (diff) | |
| download | Qt-51a2b0fde9bf635482fd2463b901139c82ed0dc4.zip Qt-51a2b0fde9bf635482fd2463b901139c82ed0dc4.tar.gz Qt-51a2b0fde9bf635482fd2463b901139c82ed0dc4.tar.bz2 | |
fix static library names when generating .pc files for pkgconfig
c354d16cc64cf516a0b5149cdc9ef74de096a998 added the version extension
which only occurs on the DLL import library.
cherry-picked from qt5/qtbase 8e053a5dfc9b4c8f100b1e77335439774f52fc61
Change-Id: Ie913adf039d7f3a9aadf43f4af014289a8aeacbe
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'qmake/generators')
| -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 66c6d49..447943a 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3258,7 +3258,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; |