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>

diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf
index 2046fc5..57d8b5d 100644 (file)
--- 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 c4e0a4f..abd6d32 100644 (file)
--- 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");