summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-04-10 20:04:23 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-19 16:45:59 +0200
commitf3cca88ac4388eb765bde675c320edf493686810 (patch)
tree17de93d9746a8bf8970b6e1a569059ebb3d48938
parent19009cde45dcdab21bb113a150ff40f06a611ac6 (diff)
move QMAKE_PKGCONFIG_VARIABLES stuff out of qt_module_config.prf
this only needs to be set in one module each - the one which provides the relevant tool. this is moderately source-incompatible, in that a package which queries a given variable from the wrong library won't get the path it looks for any more. as it's likely that everyone was using QtCore as a reference anyway, this will only affect uic - which is in the new QtWidgets library, to which people need to adjust anyway. Change-Id: If05d3c33fda6cd12466e261391b825c59651d3e4 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rw-r--r--mkspecs/features/qt_module_config.prf23
-rw-r--r--src/corelib/corelib.pro26
-rw-r--r--src/widgets/widgets.pro7
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