Ensure that qmake doesn't lose the error code when processing subdirs

When processing a project in a subdirs template failed for whatever
reason then qmake would lose the result of that and would return an
error code of 0 if the subdirs project file itself was processed fine.

So now it ensures that any errors arising from processing a project
referenced in a subdirs project file are not lost so that the error code
returned from qmake will indicate an error actually occured.

Task-number: QTBUG-4065
Reviewed-by: mariusSO
Original-commit: c15b370c9db16fdbfd9e7bec89ee9bf8c1110827

1 files changed, 5 insertions, 1 deletions

diff --git a/qmake/main.cpp b/qmake/main.cpp
index 73fdda9..a0346c5 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -168,7 +168,11 @@ int runQMake(int argc, char **argv)
                 continue;
         }
 
-        MetaMakefileGenerator *mkfile = MetaMakefileGenerator::createMetaGenerator(&project, QString(), false);
+        bool success = true;
+        MetaMakefileGenerator *mkfile = MetaMakefileGenerator::createMetaGenerator(&project, QString(), false, &success);
+        if (!success)
+            exit_val = 3;
+
         if(mkfile && !mkfile->write(oldpwd)) {
             if(Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT)
                 fprintf(stderr, "Unable to generate project file.\n");