diff options
| -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"); |