summaryrefslogtreecommitdiffstats
path: root/src/tools/rcc
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-07-13 19:32:47 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-16 16:30:55 +0200
commit1329a5778364f966cf6c42ca4fb3ff9c09f39a2f (patch)
tree329f02302186cc259cde5c264314f59ec3602a36 /src/tools/rcc
parente6abbe68a2126fe02b1f304ac356570568958099 (diff)
Generate a fatal error as appropriate.
Otherwise, subdirectories under directories which are added to a resource file generate garbage in the binary. The easiest way to see this is cd tests/auto/corelib/kernel/qvariant mkdir stream/qt4.9/somedir make && ./tst_qvariant loadQt4Stream Change-Id: I32630ecb6d515db1d135f0ffc5cf14fd8caa0a4f Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/tools/rcc')
-rw-r--r--src/tools/rcc/rcc.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index 4d9b5e15a9..32aba07b37 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -835,8 +835,10 @@ bool RCCResourceLibrary::writeDataBlobs()
pending.push(child);
else {
offset = child->writeDataBlob(*this, offset, &errorMessage);
- if (offset == 0)
+ if (offset == 0) {
m_errorDevice->write(errorMessage.toUtf8());
+ return false;
+ }
}
}
}