diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-20 10:34:13 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-20 12:38:32 +0200 |
| commit | 6d9c545d2b83305c3c30a0e917e6c3a474dfe66a (patch) | |
| tree | 54a003c6db32c85f80c5fbb46dbf9322855966e6 /qmake/main.cpp | |
| parent | 86f953a6d40666a3355e76b3ab2c8a2cf5452ec6 (diff) | |
| parent | b652bffea7a0a1bf209c21d9b73f509226f031bd (diff) | |
Merge "Merge branch 'buildsystem'" into refs/staging/master
Diffstat (limited to 'qmake/main.cpp')
| -rw-r--r-- | qmake/main.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/qmake/main.cpp b/qmake/main.cpp index 985afaa8e8..45672c67ee 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -163,10 +163,7 @@ int runQMake(int argc, char **argv) fn = fn.right(fn.length() - di - 1); } - if (!Option::prepareProject(fn)) { - exit_val = 3; - break; - } + Option::prepareProject(fn); // read project.. if(!project.read(fn)) { |