summaryrefslogtreecommitdiffstats
path: root/src/tools/rcc
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-11-04 11:57:55 +0100
committerhjk <hjk121@nokiamail.com>2014-11-05 08:04:27 +0100
commitcf30a3d9b2e8584fa419ea1a6ee3d64a140352a0 (patch)
treea7d58fb57cc372ad557521948c5f8edadfdb9db4 /src/tools/rcc
parentffcad3244ff6e2429da1bf985d6d1116c251c2ec (diff)
Rcc: ensure enough space for the embedded
The two-pass feature depends on the QRC_DATA signature that needs to be stored in the array later overwritten by the embedded data. Task-number: QTBUG-42359 Change-Id: Ida1ccff40dda28f92a4267f86f48ee96d62bd214 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
Diffstat (limited to 'src/tools/rcc')
-rw-r--r--src/tools/rcc/rcc.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index 9d8a7b7051..7623ce2e4a 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -889,6 +889,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");