diff options
| author | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2014-11-11 12:51:23 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-11-11 12:51:23 +0100 |
| commit | 9d38dbde7663a2de8186b32e222ce8fab9cf909d (patch) | |
| tree | b859ad71c3750f4cd7c2d383cc9f15cb0e0c6d7f /src/tools/rcc/rcc.cpp | |
| parent | 9b7bdd455fefc2df78eb540e9f570877aa8cd827 (diff) | |
| parent | 0d02a06517f29c5b51fb2d3ac64a5e6d9daed5a9 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.4.0" into refs/staging/5.4.0
Diffstat (limited to 'src/tools/rcc/rcc.cpp')
| -rw-r--r-- | src/tools/rcc/rcc.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp index d7f8e47213..5769ed552c 100644 --- a/src/tools/rcc/rcc.cpp +++ b/src/tools/rcc/rcc.cpp @@ -893,6 +893,8 @@ bool RCCResourceLibrary::writeDataBlobs() if (m_format == C_Code) writeString("\n};\n\n"); else if (m_format == Pass1) { + if (offset < 8) + offset = 8; writeString("\nstatic const unsigned char qt_resource_data["); writeByteArray(QByteArray::number(offset)); writeString("] = { 'Q', 'R', 'C', '_', 'D', 'A', 'T', 'A' };\n\n"); |