summaryrefslogtreecommitdiffstats
path: root/qmake/main.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-02-23 17:05:28 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-28 09:13:31 +0100
commit059200a44ba7177d0c9ec6bb5e6ee0b7e0c3f017 (patch)
tree7642a3980b3f4bbc082acfaa4b583c97ca683783 /qmake/main.cpp
parentbf29a8a27dad02f4956695e60e5be929e5ede039 (diff)
move .qmake.cache search to Option
this is a one-time operation which depends only on the invocation, so this new home is much more appropriate. Change-Id: I11ef30a8227afed06e58e64e65809dba25e81567 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/main.cpp')
-rw-r--r--qmake/main.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/qmake/main.cpp b/qmake/main.cpp
index 38e09f60fd..54cf9f9bdf 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -163,6 +163,11 @@ int runQMake(int argc, char **argv)
fn = fn.right(fn.length() - di - 1);
}
+ if (!Option::prepareProject()) {
+ exit_val = 3;
+ break;
+ }
+
// read project..
if(!project.read(fn)) {
fprintf(stderr, "Error processing project file: %s\n",