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

Add extra declarations to make rcc output pass -Wmissing-declarations

Browse Source 
The previously produced code was valid C++.  Add the declaration
nevertheless to help people who want to use the switch in their
own code.

Task-number: QTBUG-42119
Change-Id: Ia47cf3930684474ff65e5cf37335d7d7f57a1d31
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
hjk 2014-10-24 10:53:01 +02:00
parent 3f9dbc0ec8
commit e859de3fb5
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1057,6 +1057,12 @@ bool RCCResourceLibrary::writeInitializer()
QByteArray initResources = "qInitResources"; QByteArray initResources = "qInitResources";
initResources += initName; initResources += initName;
// Work around -Wmissing-declarations warnings.
writeString("int ");
writeMangleNamespaceFunction(initResources);
writeString("();\n");
writeString("int "); writeString("int ");
writeMangleNamespaceFunction(initResources); writeMangleNamespaceFunction(initResources);
writeString("()\n{\n"); writeString("()\n{\n");
@ -1073,6 +1079,12 @@ bool RCCResourceLibrary::writeInitializer()
//cleanup //cleanup
QByteArray cleanResources = "qCleanupResources"; QByteArray cleanResources = "qCleanupResources";
cleanResources += initName; cleanResources += initName;
// Work around -Wmissing-declarations warnings.
writeString("int ");
writeMangleNamespaceFunction(cleanResources);
writeString("();\n");
writeString("int "); writeString("int ");
writeMangleNamespaceFunction(cleanResources); writeMangleNamespaceFunction(cleanResources);
writeString("()\n{\n"); writeString("()\n{\n");

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

@ -116,6 +116,7 @@ bool qUnregisterResourceData(int, const unsigned char *, const unsigned char *,
} }
#endif #endif
int QT_RCC_MANGLE_NAMESPACE(qInitResources)();
int QT_RCC_MANGLE_NAMESPACE(qInitResources)() int QT_RCC_MANGLE_NAMESPACE(qInitResources)()
{ {
QT_RCC_PREPEND_NAMESPACE(qRegisterResourceData) QT_RCC_PREPEND_NAMESPACE(qRegisterResourceData)
@ -123,6 +124,7 @@ int QT_RCC_MANGLE_NAMESPACE(qInitResources)()
return 1; return 1;
} }
int QT_RCC_MANGLE_NAMESPACE(qCleanupResources)();
int QT_RCC_MANGLE_NAMESPACE(qCleanupResources)() int QT_RCC_MANGLE_NAMESPACE(qCleanupResources)()
{ {
QT_RCC_PREPEND_NAMESPACE(qUnregisterResourceData) QT_RCC_PREPEND_NAMESPACE(qUnregisterResourceData)