qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
hjk 2014-07-02 11:39:30 +02:00
parent bb0263eb80
commit c87a894927
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tools/rcc/rcc.cpp
View File

@ -995,7 +995,7 @@ bool RCCResourceLibrary::writeDataStructure()
void RCCResourceLibrary::writeMangleNamespaceFunction(const QByteArray &name) void RCCResourceLibrary::writeMangleNamespaceFunction(const QByteArray &name)
{ {
if (m_useNameSpace) { if (m_useNameSpace) {
writeString("QT_MANGLE_NAMESPACE("); writeString("QT_RCC_MANGLE_NAMESPACE(");
writeByteArray(name); writeByteArray(name);
writeChar(')'); writeChar(')');
} else { } else {
@ -1006,7 +1006,7 @@ void RCCResourceLibrary::writeMangleNamespaceFunction(const QByteArray &name)
void RCCResourceLibrary::writeAddNamespaceFunction(const QByteArray &name) void RCCResourceLibrary::writeAddNamespaceFunction(const QByteArray &name)
{ {
if (m_useNameSpace) { if (m_useNameSpace) {
writeString("QT_PREPEND_NAMESPACE("); writeString("QT_RCC_PREPEND_NAMESPACE(");
writeByteArray(name); writeByteArray(name);
writeChar(')'); writeChar(')');
} else { } else {
@ -1028,15 +1028,15 @@ bool RCCResourceLibrary::writeInitializer()
//init //init
if (m_useNameSpace) { if (m_useNameSpace) {
writeString("#ifdef QT_NAMESPACE\n" writeString("#ifdef QT_NAMESPACE\n"
"# define QT_PREPEND_NAMESPACE(name) ::QT_NAMESPACE::name\n" "# define QT_RCC_PREPEND_NAMESPACE(name) ::QT_NAMESPACE::name\n"
"# define QT_MANGLE_NAMESPACE0(x) x\n" "# define QT_RCC_MANGLE_NAMESPACE0(x) x\n"
"# define QT_MANGLE_NAMESPACE1(a, b) a##_##b\n" "# define QT_RCC_MANGLE_NAMESPACE1(a, b) a##_##b\n"
"# define QT_MANGLE_NAMESPACE2(a, b) QT_MANGLE_NAMESPACE1(a,b)\n" "# define QT_RCC_MANGLE_NAMESPACE2(a, b) QT_RCC_MANGLE_NAMESPACE1(a,b)\n"
"# define QT_MANGLE_NAMESPACE(name) QT_MANGLE_NAMESPACE2( \\\n" "# define QT_RCC_MANGLE_NAMESPACE(name) QT_RCC_MANGLE_NAMESPACE2( \\\n"
" QT_MANGLE_NAMESPACE0(name), QT_MANGLE_NAMESPACE0(QT_NAMESPACE))\n" " QT_RCC_MANGLE_NAMESPACE0(name), QT_RCC_MANGLE_NAMESPACE0(QT_NAMESPACE))\n"
"#else\n" "#else\n"
"# define QT_PREPEND_NAMESPACE(name) name\n" "# define QT_RCC_PREPEND_NAMESPACE(name) name\n"
"# define QT_MANGLE_NAMESPACE(name) name\n" "# define QT_RCC_MANGLE_NAMESPACE(name) name\n"
"#endif\n\n"); "#endif\n\n");
writeString("#ifdef QT_NAMESPACE\n" writeString("#ifdef QT_NAMESPACE\n"
@ -1089,8 +1089,8 @@ bool RCCResourceLibrary::writeInitializer()
writeByteArray( writeByteArray(
"namespace {\n" "namespace {\n"
" struct initializer {\n" " struct initializer {\n"
" initializer() { QT_MANGLE_NAMESPACE(" + initResources + ")(); }\n" " initializer() { QT_RCC_MANGLE_NAMESPACE(" + initResources + ")(); }\n"
" ~initializer() { QT_MANGLE_NAMESPACE(" + cleanResources + ")(); }\n" " ~initializer() { QT_RCC_MANGLE_NAMESPACE(" + cleanResources + ")(); }\n"
" } dummy;\n" " } dummy;\n"
"}\n"); "}\n");

28
tests/auto/tools/rcc/data/images/images.expected
View File

@ -93,15 +93,15 @@ static const unsigned char qt_resource_struct[] = {
}; };
#ifdef QT_NAMESPACE #ifdef QT_NAMESPACE
# define QT_PREPEND_NAMESPACE(name) ::QT_NAMESPACE::name # define QT_RCC_PREPEND_NAMESPACE(name) ::QT_NAMESPACE::name
# define QT_MANGLE_NAMESPACE0(x) x # define QT_RCC_MANGLE_NAMESPACE0(x) x
# define QT_MANGLE_NAMESPACE1(a, b) a##_##b # define QT_RCC_MANGLE_NAMESPACE1(a, b) a##_##b
# define QT_MANGLE_NAMESPACE2(a, b) QT_MANGLE_NAMESPACE1(a,b) # define QT_RCC_MANGLE_NAMESPACE2(a, b) QT_RCC_MANGLE_NAMESPACE1(a,b)
# define QT_MANGLE_NAMESPACE(name) QT_MANGLE_NAMESPACE2( \ # define QT_RCC_MANGLE_NAMESPACE(name) QT_RCC_MANGLE_NAMESPACE2( \
QT_MANGLE_NAMESPACE0(name), QT_MANGLE_NAMESPACE0(QT_NAMESPACE)) QT_RCC_MANGLE_NAMESPACE0(name), QT_RCC_MANGLE_NAMESPACE0(QT_NAMESPACE))
#else #else
# define QT_PREPEND_NAMESPACE(name) name # define QT_RCC_PREPEND_NAMESPACE(name) name
# define QT_MANGLE_NAMESPACE(name) name # define QT_RCC_MANGLE_NAMESPACE(name) name
#endif #endif
#ifdef QT_NAMESPACE #ifdef QT_NAMESPACE
@ -116,23 +116,23 @@ bool qUnregisterResourceData(int, const unsigned char *, const unsigned char *,
} }
#endif #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); (0x01, qt_resource_struct, qt_resource_name, qt_resource_data);
return 1; 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); (0x01, qt_resource_struct, qt_resource_name, qt_resource_data);
return 1; return 1;
} }
namespace { namespace {
struct initializer { struct initializer {
initializer() { QT_MANGLE_NAMESPACE(qInitResources)(); } initializer() { QT_RCC_MANGLE_NAMESPACE(qInitResources)(); }
~initializer() { QT_MANGLE_NAMESPACE(qCleanupResources)(); } ~initializer() { QT_RCC_MANGLE_NAMESPACE(qCleanupResources)(); }
} dummy; } dummy;
} }