diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-01 14:23:41 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-02 18:07:35 +0100 |
| commit | 76dfe82addb4e4954246d5ba9dc693315f0cdb6a (patch) | |
| tree | 919d664f5026e7f078e78a912f39b4eb2515b6a2 | |
| parent | 32437370d6d5a730c23607e04c9b0ae9475ebb35 (diff) | |
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>
| -rw-r--r-- | mkspecs/features/qt.prf | 2 | ||||
| -rw-r--r-- | src/corelib/corelib.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index c4b991becd..2eb748c359 100644 --- 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 ba9488cbff..46c771e6a5 100644 --- 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 |