From c87a8949274adc5dcc34164ca081faff076495bf Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 2 Jul 2014 11:39:30 +0200 Subject: RCC: Use macros not defined in qglobal.h This prevents conflicts in case of link time optimizations or precompiled headers are used since we don't include qglobal.h in the generated code. Change-Id: I4266c8ae38e6eafefd28b3bde5cb725a24d67ea0 Reviewed-by: Oswald Buddenhagen --- src/tools/rcc/rcc.cpp | 24 ++++++++++---------- tests/auto/tools/rcc/data/images/images.expected | 28 ++++++++++++------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp index d460109a9b..3896f6c0e3 100644 --- a/src/tools/rcc/rcc.cpp +++ b/src/tools/rcc/rcc.cpp @@ -995,7 +995,7 @@ bool RCCResourceLibrary::writeDataStructure() void RCCResourceLibrary::writeMangleNamespaceFunction(const QByteArray &name) { if (m_useNameSpace) { - writeString("QT_MANGLE_NAMESPACE("); + writeString("QT_RCC_MANGLE_NAMESPACE("); writeByteArray(name); writeChar(')'); } else { @@ -1006,7 +1006,7 @@ void RCCResourceLibrary::writeMangleNamespaceFunction(const QByteArray &name) void RCCResourceLibrary::writeAddNamespaceFunction(const QByteArray &name) { if (m_useNameSpace) { - writeString("QT_PREPEND_NAMESPACE("); + writeString("QT_RCC_PREPEND_NAMESPACE("); writeByteArray(name); writeChar(')'); } else { @@ -1028,15 +1028,15 @@ bool RCCResourceLibrary::writeInitializer() //init if (m_useNameSpace) { writeString("#ifdef QT_NAMESPACE\n" - "# define QT_PREPEND_NAMESPACE(name) ::QT_NAMESPACE::name\n" - "# define QT_MANGLE_NAMESPACE0(x) x\n" - "# define QT_MANGLE_NAMESPACE1(a, b) a##_##b\n" - "# define QT_MANGLE_NAMESPACE2(a, b) QT_MANGLE_NAMESPACE1(a,b)\n" - "# define QT_MANGLE_NAMESPACE(name) QT_MANGLE_NAMESPACE2( \\\n" - " QT_MANGLE_NAMESPACE0(name), QT_MANGLE_NAMESPACE0(QT_NAMESPACE))\n" + "# define QT_RCC_PREPEND_NAMESPACE(name) ::QT_NAMESPACE::name\n" + "# define QT_RCC_MANGLE_NAMESPACE0(x) x\n" + "# define QT_RCC_MANGLE_NAMESPACE1(a, b) a##_##b\n" + "# define QT_RCC_MANGLE_NAMESPACE2(a, b) QT_RCC_MANGLE_NAMESPACE1(a,b)\n" + "# define QT_RCC_MANGLE_NAMESPACE(name) QT_RCC_MANGLE_NAMESPACE2( \\\n" + " QT_RCC_MANGLE_NAMESPACE0(name), QT_RCC_MANGLE_NAMESPACE0(QT_NAMESPACE))\n" "#else\n" - "# define QT_PREPEND_NAMESPACE(name) name\n" - "# define QT_MANGLE_NAMESPACE(name) name\n" + "# define QT_RCC_PREPEND_NAMESPACE(name) name\n" + "# define QT_RCC_MANGLE_NAMESPACE(name) name\n" "#endif\n\n"); writeString("#ifdef QT_NAMESPACE\n" @@ -1089,8 +1089,8 @@ bool RCCResourceLibrary::writeInitializer() writeByteArray( "namespace {\n" " struct initializer {\n" - " initializer() { QT_MANGLE_NAMESPACE(" + initResources + ")(); }\n" - " ~initializer() { QT_MANGLE_NAMESPACE(" + cleanResources + ")(); }\n" + " initializer() { QT_RCC_MANGLE_NAMESPACE(" + initResources + ")(); }\n" + " ~initializer() { QT_RCC_MANGLE_NAMESPACE(" + cleanResources + ")(); }\n" " } dummy;\n" "}\n"); diff --git a/tests/auto/tools/rcc/data/images/images.expected b/tests/auto/tools/rcc/data/images/images.expected index 2577b6319b..ae470db336 100644 --- a/tests/auto/tools/rcc/data/images/images.expected +++ b/tests/auto/tools/rcc/data/images/images.expected @@ -93,15 +93,15 @@ static const unsigned char qt_resource_struct[] = { }; #ifdef QT_NAMESPACE -# define QT_PREPEND_NAMESPACE(name) ::QT_NAMESPACE::name -# define QT_MANGLE_NAMESPACE0(x) x -# define QT_MANGLE_NAMESPACE1(a, b) a##_##b -# define QT_MANGLE_NAMESPACE2(a, b) QT_MANGLE_NAMESPACE1(a,b) -# define QT_MANGLE_NAMESPACE(name) QT_MANGLE_NAMESPACE2( \ - QT_MANGLE_NAMESPACE0(name), QT_MANGLE_NAMESPACE0(QT_NAMESPACE)) +# define QT_RCC_PREPEND_NAMESPACE(name) ::QT_NAMESPACE::name +# define QT_RCC_MANGLE_NAMESPACE0(x) x +# define QT_RCC_MANGLE_NAMESPACE1(a, b) a##_##b +# define QT_RCC_MANGLE_NAMESPACE2(a, b) QT_RCC_MANGLE_NAMESPACE1(a,b) +# define QT_RCC_MANGLE_NAMESPACE(name) QT_RCC_MANGLE_NAMESPACE2( \ + QT_RCC_MANGLE_NAMESPACE0(name), QT_RCC_MANGLE_NAMESPACE0(QT_NAMESPACE)) #else -# define QT_PREPEND_NAMESPACE(name) name -# define QT_MANGLE_NAMESPACE(name) name +# define QT_RCC_PREPEND_NAMESPACE(name) name +# define QT_RCC_MANGLE_NAMESPACE(name) name #endif #ifdef QT_NAMESPACE @@ -116,23 +116,23 @@ bool qUnregisterResourceData(int, const unsigned char *, const unsigned char *, } #endif -int QT_MANGLE_NAMESPACE(qInitResources)() +int QT_RCC_MANGLE_NAMESPACE(qInitResources)() { - QT_PREPEND_NAMESPACE(qRegisterResourceData) + QT_RCC_PREPEND_NAMESPACE(qRegisterResourceData) (0x01, qt_resource_struct, qt_resource_name, qt_resource_data); return 1; } -int QT_MANGLE_NAMESPACE(qCleanupResources)() +int QT_RCC_MANGLE_NAMESPACE(qCleanupResources)() { - QT_PREPEND_NAMESPACE(qUnregisterResourceData) + QT_RCC_PREPEND_NAMESPACE(qUnregisterResourceData) (0x01, qt_resource_struct, qt_resource_name, qt_resource_data); return 1; } namespace { struct initializer { - initializer() { QT_MANGLE_NAMESPACE(qInitResources)(); } - ~initializer() { QT_MANGLE_NAMESPACE(qCleanupResources)(); } + initializer() { QT_RCC_MANGLE_NAMESPACE(qInitResources)(); } + ~initializer() { QT_RCC_MANGLE_NAMESPACE(qCleanupResources)(); } } dummy; } -- cgit v1.2.3