diff options
-rw-r--r-- | mkspecs/features/qt_module_config.prf | 23 | ||||
-rw-r--r-- | src/corelib/corelib.pro | 26 | ||||
-rw-r--r-- | src/widgets/widgets.pro | 7 |
3 files changed, 32 insertions, 24 deletions
diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index 90952be57b..95a30a9c22 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -202,29 +202,6 @@ DEFINES *= QT_DEPRECATED_WARNINGS TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end -qtPrepareTool(QMAKE_MOC, moc) -qtPrepareTool(QMAKE_UIC, uic) -qtPrepareTool(QMAKE_RCC, rcc) -qtPrepareTool(QMAKE_LUPDATE, lupdate) -qtPrepareTool(QMAKE_LRELEASE, lrelease) - -moc_dir.name = moc_location -moc_dir.variable = QMAKE_MOC - -uic_dir.name = uic_location -uic_dir.variable = QMAKE_UIC - -rcc_dir.name = rcc_location -rcc_dir.variable = QMAKE_RCC - -lupdate_dir.name = lupdate_location -lupdate_dir.variable = QMAKE_LUPDATE - -lrelease_dir.name = lrelease_location -lrelease_dir.variable = QMAKE_LRELEASE - -QMAKE_PKGCONFIG_VARIABLES += moc_dir uic_dir rcc_dir lupdate_dir lrelease_dir - load(qt_targets) win32:DEFINES+=_USE_MATH_DEFINES diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index e91d6cda79..8ea8395544 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -3,7 +3,7 @@ load(qt_module) TARGET = QtCore QPRO_PWD = $$PWD QT = -CONFIG += moc resources exceptions +CONFIG += exceptions MODULE = core # not corelib, as per project file MODULE_CONFIG = moc resources @@ -48,3 +48,27 @@ QMAKE_LIBS += $$QMAKE_LIBS_CORE QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtCore.dynlist contains(DEFINES,QT_EVAL):include(eval.pri) + +load(moc) +load(resources) + +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 diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index f3e14b73b0..2df97fb98b 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -52,3 +52,10 @@ INCLUDEPATH += ../3rdparty/harfbuzz/src 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 |