diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2013-10-22 06:28:27 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-28 00:37:15 +0100 |
| commit | d5a16e4a3c02bd273e1d7329eb02e3e7f60c0b7f (patch) | |
| tree | 2224f8eb88d7c680cd200807f77e14ae2a754e4d /qmake/generators/makefile.cpp | |
| parent | 942a59d8fbb1ab6956887f6caa3c0595798b8afc (diff) | |
Add QMAKE_PKGCONFIG_VERSION variable to allow version overriding
Change-Id: Ibba50c74f308d81e0058e4dacec7ed84e738473e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake/generators/makefile.cpp')
| -rw-r--r-- | qmake/generators/makefile.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index f567b6c694..3093c834cc 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3270,7 +3270,11 @@ MakefileGenerator::writePkgConfigFile() } } 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 t << "Libs: "; |