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

they don't belong into the global scope

Change-Id: I27a3de5f706392b3c4a84035521bc3b4e4055740
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf
index 250ac0e..4fa55ac 100644 (file)
--- a/mkspecs/features/default_pre.prf
+++ b/mkspecs/features/default_pre.prf
@@ -1,6 +1,5 @@
 load(exclusive_builds)
-### Qt 5: remove "uic" and "resources" - or add "qt"
-CONFIG = lex yacc warn_on debug uic resources exceptions $$CONFIG
+CONFIG = lex yacc warn_on debug exceptions $$CONFIG
 
 !build_pass:exists($$_PRO_FILE_PWD_/sync.profile) {
     PRO_BASENAME = $$basename(_PRO_FILE_)

diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 9ec2d1f..1912f60 100644 (file)
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -1,4 +1,4 @@
-CONFIG *= moc thread
+CONFIG *= thread
 
 #handle defines
 win32 {

diff --git a/mkspecs/features/resources.prf b/mkspecs/features/resources.prf
index 47e7188..dfded30 100644 (file)
--- a/mkspecs/features/resources.prf
+++ b/mkspecs/features/resources.prf
@@ -1,4 +1,3 @@
-defined(qtPrepareTool)|load(qt_functions) ### Qt 5: see default_pre.prf
 qtPrepareTool(QMAKE_RCC, rcc)
 
 isEmpty(RCC_DIR):RCC_DIR = .

diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf
index 74a2683..db08505 100644 (file)
--- a/mkspecs/features/uic.prf
+++ b/mkspecs/features/uic.prf
@@ -1,4 +1,3 @@
-defined(qtPrepareTool)|load(qt_functions) ### Qt 5: see default_pre.prf
 qtPrepareTool(QMAKE_UIC3, uic3)
 qtPrepareTool(QMAKE_UIC, uic)
 

diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index 545a94f..77666d4 100644 (file)
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -4,7 +4,7 @@ TARGET     = QtCore
 QPRO_PWD   = $$PWD
 QT         =
 
-CONFIG += module exceptions
+CONFIG += module moc resources exceptions
 MODULE = core     # not corelib, as per project file
 MODULE_PRI = ../modules/qt_core.pri
 

diff --git a/src/modules/qt_core.pri b/src/modules/qt_core.pri
index e6e5df9..8105992 100644 (file)
--- a/src/modules/qt_core.pri
+++ b/src/modules/qt_core.pri
@@ -13,3 +13,4 @@ QT.core.plugins = $$QT_MODULE_PLUGIN_BASE
 QT.core.imports = $$QT_MODULE_IMPORT_BASE
 QT.core.depends =
 QT.core.DEFINES = QT_CORE_LIB
+QT.core.CONFIG = moc resources

diff --git a/src/modules/qt_widgets.pri b/src/modules/qt_widgets.pri
index 9e42fda..69ad509 100644 (file)
--- a/src/modules/qt_widgets.pri
+++ b/src/modules/qt_widgets.pri
@@ -13,3 +13,4 @@ QT.widgets.plugins = $$QT_MODULE_PLUGIN_BASE
 QT.widgets.imports = $$QT_MODULE_IMPORT_BASE
 QT.widgets.depends = core gui
 QT.widgets.DEFINES = QT_WIDGETS_LIB
+QT.widgets.CONFIG = uic

diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro
index 85321ff..fef42b9 100644 (file)
--- a/src/widgets/widgets.pro
+++ b/src/widgets/widgets.pro
@@ -4,7 +4,7 @@ TARGET     = QtWidgets
 QPRO_PWD   = $$PWD
 QT = core core-private gui gui-private platformsupport-private
 
-CONFIG += module
+CONFIG += module uic
 MODULE_PRI = ../modules/qt_widgets.pri
 
 DEFINES   += QT_BUILD_WIDGETS_LIB QT_NO_USING_NAMESPACE