AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move QMAKE_PKGCONFIG_VARIABLES stuff out of qt_module_config.prf

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-04-10 20:04:23 +02:00
parent 19009cde45
commit f3cca88ac4
3 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mkspecs/features/qt_module_config.prf
View File

@ -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

26
src/corelib/corelib.pro
View File

@ -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

7
src/widgets/widgets.pro
View File

@ -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