diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-10-21 04:32:32 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-10-21 04:32:32 (GMT) |
| commit | da433db6b88cc82b9897a95ce790a02bea14d900 (patch) | |
| tree | 4ca554455bec2a9c3be88a4b3535ef3bd9c114f0 /qmake/main.cpp | |
| parent | 0cb251e67ae45d8ab5ad715a4bc6dcf89209d2ab (diff) | |
| parent | 7997279bc22d30bf1d1a30a567bda33ecc9aeb2d (diff) | |
| download | Qt-da433db6b88cc82b9897a95ce790a02bea14d900.zip Qt-da433db6b88cc82b9897a95ce790a02bea14d900.tar.gz Qt-da433db6b88cc82b9897a95ce790a02bea14d900.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
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"); |