diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 13:22:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-10-28 10:32:06 +0100 |
| commit | af3bd5037aeb9b842193f0e21cd5c03572b6dac6 (patch) | |
| tree | 7ce55202a0d40b75b18da24722d373376142d206 /src/tools | |
| parent | 5adbb9cc576546c42249099e549f1947cca54610 (diff) | |
| parent | 2eb26c170920d28213b71e549d5dac4663febb14 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/rcc/rcc.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp index 11a99d136d..9d8a7b7051 100644 --- a/src/tools/rcc/rcc.cpp +++ b/src/tools/rcc/rcc.cpp @@ -1057,6 +1057,12 @@ bool RCCResourceLibrary::writeInitializer() QByteArray initResources = "qInitResources"; initResources += initName; + + // Work around -Wmissing-declarations warnings. + writeString("int "); + writeMangleNamespaceFunction(initResources); + writeString("();\n"); + writeString("int "); writeMangleNamespaceFunction(initResources); writeString("()\n{\n"); @@ -1073,6 +1079,12 @@ bool RCCResourceLibrary::writeInitializer() //cleanup QByteArray cleanResources = "qCleanupResources"; cleanResources += initName; + + // Work around -Wmissing-declarations warnings. + writeString("int "); + writeMangleNamespaceFunction(cleanResources); + writeString("();\n"); + writeString("int "); writeMangleNamespaceFunction(cleanResources); writeString("()\n{\n"); |