From 1329a5778364f966cf6c42ca4fb3ff9c09f39a2f Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Fri, 13 Jul 2012 19:32:47 +0200
Subject: 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>
---
 src/tools/rcc/rcc.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/tools/rcc/rcc.cpp')

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;
+                }
             }
         }
     }
-- 
cgit v1.2.3