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

Add QMAKE_PKGCONFIG_VERSION variable to allow version overriding

Browse Source 
Change-Id: Ibba50c74f308d81e0058e4dacec7ed84e738473e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Konstantin Ritt 2013-10-22 06:28:27 +03:00 committed by The Qt Project
parent 942a59d8fb
commit d5a16e4a3c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qmake/generators/makefile.cpp
View File

@ -3270,7 +3270,11 @@ MakefileGenerator::writePkgConfigFile()
} }
} }
t << "Description: " << desc << endl; t << "Description: " << desc << endl;
t << "Version: " << project->first("VERSION") << endl; ProString version = project->first("QMAKE_PKGCONFIG_VERSION");
if (version.isEmpty())
version = project->first("VERSION");
if (!version.isEmpty())
t << "Version: " << version << endl;
// libs // libs
t << "Libs: "; t << "Libs: ";