move QT_NAMESPACE define to qtcore's module pri file

it's basically an attribute of qtcore (and everything that depends on it).

Change-Id: I6eeefeb5df70764399d9f22dca9dbec1843b8d68
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index c4b991b..2eb748c 100644 (file)
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -102,5 +102,3 @@ qtAddModules(QT_PRIVATE, LIBS_PRIVATE)
 wince*:static:gui {
    QTLIB += qmenu_wce.res
 }
-
-!isEmpty(QT_NAMESPACE):DEFINES *= QT_NAMESPACE=$$QT_NAMESPACE

diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index ba9488c..46c771e 100644 (file)
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -4,6 +4,7 @@ CONFIG    += exceptions
 
 MODULE = core     # not corelib, as per project file
 MODULE_CONFIG = moc resources
+!isEmpty(QT_NAMESPACE): MODULE_DEFINES = QT_NAMESPACE=$$QT_NAMESPACE
 
 DEFINES   += QT_NO_USING_NAMESPACE
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x67000000
@@ -41,6 +42,7 @@ mac|darwin {
 }
 mac:lib_bundle:DEFINES += QT_NO_DEBUG_PLUGIN_CHECK
 win32:DEFINES-=QT_NO_CAST_TO_ASCII
+DEFINES += $$MODULE_DEFINES
 
 QMAKE_LIBS += $$QMAKE_LIBS_CORE