summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-07-02 11:39:30 +0200
committerhjk <hjk121@nokiamail.com>2014-07-16 17:40:14 +0200
commitc87a8949274adc5dcc34164ca081faff076495bf (patch)
tree6ed937ceaf191015ae3569272a01f5fb218b892d /src/tools
parentbb0263eb80620b64057b6a0a1d6bccad3d3e6282 (diff)
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 <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/rcc/rcc.cpp24
1 files changed, 12 insertions, 12 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");