summaryrefslogtreecommitdiffstats
path: root/qmake/main.cpp
diff options
context:
space:
mode:
authorAndy Shaw <qt-info@nokia.com>2009-10-20 18:24:44 (GMT)
committerAndy Shaw <qt-info@nokia.com>2009-10-20 18:24:44 (GMT)
commit1315bcdd1e2add0ce26f0cb9a4d2a95477434315 (patch)
tree20e6192aa231511944d319cc99108f0cc821c8f2 /qmake/main.cpp
parent613866eb719e35fa2459cb12d46315ca9dcefa62 (diff)
downloadQt-1315bcdd1e2add0ce26f0cb9a4d2a95477434315.zip
Qt-1315bcdd1e2add0ce26f0cb9a4d2a95477434315.tar.gz
Qt-1315bcdd1e2add0ce26f0cb9a4d2a95477434315.tar.bz2
Ensure qmake does not lose the error code when going over the subdirs
When qmake was ran with -r over a subdirs project then it would lose the error code if a later project succeeded. This is a refix of the previous revert which has been confirmed to work all over the place now. Reviewed-by: Marius Storm-Olsen
Diffstat (limited to 'qmake/main.cpp')
-rw-r--r--qmake/main.cpp6
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");