diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-10-23 12:57:30 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-10-23 12:57:30 (GMT) |
| commit | 4ff3e1ca7ce8afab49e5c52a1ae0141abfc8a841 (patch) | |
| tree | 592d015d93478525504f8e09154b633fa2abdae2 /qmake/main.cpp | |
| parent | c21d3a0094b0692f2f888b04e258229234200e3c (diff) | |
| parent | 05aaab72d69a7fa9c23811c1d3ee7d91a9174e46 (diff) | |
| download | Qt-4ff3e1ca7ce8afab49e5c52a1ae0141abfc8a841.zip Qt-4ff3e1ca7ce8afab49e5c52a1ae0141abfc8a841.tar.gz Qt-4ff3e1ca7ce8afab49e5c52a1ae0141abfc8a841.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qscriptprogram
Conflicts:
src/script/api/qscriptengine.cpp
tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
Diffstat (limited to 'qmake/main.cpp')
| -rw-r--r-- | qmake/main.cpp | 6 |
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"); |