1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move QT_NAMESPACE define to qtcore's module pri file

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

Change-Id: I6eeefeb5df70764399d9f22dca9dbec1843b8d68
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2012-11-01 14:23:41 +01:00 committed by The Qt Project
parent 32437370d6
commit 76dfe82add
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/qt.prf
View File

@ -102,5 +102,3 @@ qtAddModules(QT_PRIVATE, LIBS_PRIVATE)
wince*:static:gui { wince*:static:gui {
QTLIB += qmenu_wce.res QTLIB += qmenu_wce.res
} }
!isEmpty(QT_NAMESPACE):DEFINES *= QT_NAMESPACE=$$QT_NAMESPACE

2
src/corelib/corelib.pro
View File

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