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

move moc, rcc and uic CONFIG additions to the respective qt modules

Browse Source 
they don't belong into the global scope

Change-Id: I27a3de5f706392b3c4a84035521bc3b4e4055740
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-02-24 19:21:51 +01:00
parent 290aae5a3a
commit 107aeb870b
8 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mkspecs/features/default_pre.prf
View File

@ -1,6 +1,5 @@
load(exclusive_builds) load(exclusive_builds)
### Qt 5: remove "uic" and "resources" - or add "qt" CONFIG = lex yacc warn_on debug exceptions $$CONFIG
CONFIG = lex yacc warn_on debug uic resources exceptions $$CONFIG
!build_pass:exists($$_PRO_FILE_PWD_/sync.profile) { !build_pass:exists($$_PRO_FILE_PWD_/sync.profile) {
PRO_BASENAME = $$basename(_PRO_FILE_) PRO_BASENAME = $$basename(_PRO_FILE_)

2
mkspecs/features/qt.prf
View File

@ -1,4 +1,4 @@
CONFIG *= moc thread CONFIG *= thread
#handle defines #handle defines
win32 { win32 {

1
mkspecs/features/resources.prf
View File

@ -1,4 +1,3 @@
defined(qtPrepareTool)|load(qt_functions) ### Qt 5: see default_pre.prf
qtPrepareTool(QMAKE_RCC, rcc) qtPrepareTool(QMAKE_RCC, rcc)
isEmpty(RCC_DIR):RCC_DIR = . isEmpty(RCC_DIR):RCC_DIR = .

1
mkspecs/features/uic.prf
View File

@ -1,4 +1,3 @@
defined(qtPrepareTool)|load(qt_functions) ### Qt 5: see default_pre.prf
qtPrepareTool(QMAKE_UIC3, uic3) qtPrepareTool(QMAKE_UIC3, uic3)
qtPrepareTool(QMAKE_UIC, uic) qtPrepareTool(QMAKE_UIC, uic)

2
src/corelib/corelib.pro
View File

@ -4,7 +4,7 @@ TARGET = QtCore
QPRO_PWD = $$PWD QPRO_PWD = $$PWD
QT = QT =
CONFIG += module exceptions CONFIG += module moc resources exceptions
MODULE = core # not corelib, as per project file MODULE = core # not corelib, as per project file
MODULE_PRI = ../modules/qt_core.pri MODULE_PRI = ../modules/qt_core.pri

1
src/modules/qt_core.pri
View File

@ -13,3 +13,4 @@ QT.core.plugins = $$QT_MODULE_PLUGIN_BASE
QT.core.imports = $$QT_MODULE_IMPORT_BASE QT.core.imports = $$QT_MODULE_IMPORT_BASE
QT.core.depends = QT.core.depends =
QT.core.DEFINES = QT_CORE_LIB QT.core.DEFINES = QT_CORE_LIB
QT.core.CONFIG = moc resources

1
src/modules/qt_widgets.pri
View File

@ -13,3 +13,4 @@ QT.widgets.plugins = $$QT_MODULE_PLUGIN_BASE
QT.widgets.imports = $$QT_MODULE_IMPORT_BASE QT.widgets.imports = $$QT_MODULE_IMPORT_BASE
QT.widgets.depends = core gui QT.widgets.depends = core gui
QT.widgets.DEFINES = QT_WIDGETS_LIB QT.widgets.DEFINES = QT_WIDGETS_LIB
QT.widgets.CONFIG = uic

2
src/widgets/widgets.pro
View File

@ -4,7 +4,7 @@ TARGET = QtWidgets
QPRO_PWD = $$PWD QPRO_PWD = $$PWD
QT = core core-private gui gui-private platformsupport-private QT = core core-private gui gui-private platformsupport-private
CONFIG += module CONFIG += module uic
MODULE_PRI = ../modules/qt_widgets.pri MODULE_PRI = ../modules/qt_widgets.pri
DEFINES += QT_BUILD_WIDGETS_LIB QT_NO_USING_NAMESPACE DEFINES += QT_BUILD_WIDGETS_LIB QT_NO_USING_NAMESPACE