diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index b8de8e9965..457ab7e2d9 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -178,9 +178,7 @@ unix|win32-g++* { include_replace.replace = $$[QT_INSTALL_HEADERS/raw] lib_replace.match = $$[QT_INSTALL_LIBS/get] lib_replace.replace = $$[QT_INSTALL_LIBS/raw] - prefix_replace.match = $$QT_BUILD_TREE - prefix_replace.replace = $$[QT_INSTALL_PREFIX/raw] - QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace prefix_replace + QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace } unix { diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 46c771e6a5..1059d0defe 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -6,6 +6,7 @@ MODULE = core # not corelib, as per project file MODULE_CONFIG = moc resources !isEmpty(QT_NAMESPACE): MODULE_DEFINES = QT_NAMESPACE=$$QT_NAMESPACE +CONFIG += $$MODULE_CONFIG DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x67000000 irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused @@ -50,29 +51,11 @@ QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtCore.dynlist contains(DEFINES,QT_EVAL):include(eval.pri) -load(moc) -load(resources) +HOST_BINS = $$[QT_HOST_BINS] +host_bins.name = host_bins +host_bins.variable = HOST_BINS -moc_dir.name = moc_location -moc_dir.variable = QMAKE_MOC - -rcc_dir.name = rcc_location -rcc_dir.variable = QMAKE_RCC - -QMAKE_PKGCONFIG_VARIABLES += moc_dir rcc_dir - -# These are aliens, but Linguist installs no own module, and it fits here best. - -qtPrepareTool(QMAKE_LUPDATE, lupdate) -qtPrepareTool(QMAKE_LRELEASE, lrelease) - -lupdate_dir.name = lupdate_location -lupdate_dir.variable = QMAKE_LUPDATE - -lrelease_dir.name = lrelease_location -lrelease_dir.variable = QMAKE_LRELEASE - -QMAKE_PKGCONFIG_VARIABLES += lupdate_dir lrelease_dir +QMAKE_PKGCONFIG_VARIABLES += host_bins ctest_macros_file.input = $$PWD/Qt5CTestMacros.cmake ctest_macros_file.output = $$DESTDIR/cmake/Qt5Core/Qt5CTestMacros.cmake diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index 5f06d4a522..6b9aa92fd9 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -2,6 +2,7 @@ TARGET = QtWidgets QT = core-private gui-private MODULE_CONFIG = uic +CONFIG += $$MODULE_CONFIG DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000 irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused @@ -44,10 +45,3 @@ testcocoon { win32:!contains(QT_CONFIG, directwrite) { DEFINES += QT_NO_DIRECTWRITE } - -load(uic) - -uic_dir.name = uic_location -uic_dir.variable = QMAKE_UIC - -QMAKE_PKGCONFIG_VARIABLES += uic_dir