diff options
| -rw-r--r-- | mkspecs/features/qt_module.prf | 4 | ||||
| -rw-r--r-- | src/corelib/corelib.pro | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index fa3bea35ab..4d533d165c 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -172,10 +172,6 @@ win32 { TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end -qt_conf.name = qt_config -qt_conf.variable = QT_CONFIG -QMAKE_PKGCONFIG_VARIABLES += qt_conf - load(qt_targets) win32:DEFINES+=_USE_MATH_DEFINES diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index bf2fd3c84a..4462203a11 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -54,7 +54,10 @@ HOST_BINS = $$[QT_HOST_BINS/raw] host_bins.name = host_bins host_bins.variable = HOST_BINS -QMAKE_PKGCONFIG_VARIABLES += host_bins +qt_conf.name = qt_config +qt_conf.variable = QT_CONFIG + +QMAKE_PKGCONFIG_VARIABLES += host_bins qt_conf ctest_macros_file.input = $$PWD/Qt5CTestMacros.cmake ctest_macros_file.output = $$DESTDIR/cmake/Qt5Core/Qt5CTestMacros.cmake |