diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-06-30 09:05:13 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-03 01:08:44 +0200 |
| commit | d53f5db95366b550c23ef3684ef24d09d2d66fea (patch) | |
| tree | dcb1b2233183e73aa222a42878081730d7519edb | |
| parent | 2ff6086e0655449ee0c7ca0e4e91ee5bda7ca7bf (diff) | |
qmake: improve the .pc files generator
Don't hardcode the "qt_config" EXTRA variable and use QMAKE_PKGCONFIG_VARIABLES instead.
This allows qmake create the .pc files that are unrelated to Qt.
Change-Id: Ic72005e8819a15f6c50f3aaf79424a247fba20af
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | mkspecs/features/qt_module_config.prf | 5 | ||||
| -rw-r--r-- | qmake/generators/makefile.cpp | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index 2046fc5eda..57d8b5d677 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -227,6 +227,11 @@ DEFINES *= QT_DEPRECATED_WARNINGS TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end +# Provides useful info normally only contained in the internal .qmake.cache file +qt_conf.name = qt_config +qt_conf.variable = CONFIG +QMAKE_PKGCONFIG_VARIABLES += qt_conf + load(qt_targets) win32:DEFINES+=_USE_MATH_DEFINES diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index c4e0a4face..abd6d320aa 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3201,9 +3201,7 @@ MakefileGenerator::writePkgConfigFile() t << "exec_prefix=${prefix}\n" << "libdir=" << pkgConfigFixPath(libDir) << "\n" << "includedir=" << pkgConfigFixPath(includeDir) << endl; - // non-standard entry. Provides useful info normally only - // contained in the internal .qmake.cache file - t << varGlue("CONFIG", "qt_config=", " ", "") << endl; + t << endl; //extra PKGCONFIG variables const QStringList &pkgconfig_vars = project->values("QMAKE_PKGCONFIG_VARIABLES"); |