diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-05-09 15:14:37 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:37:49 +0200 |
| commit | 4e9cbfc90f6db09d865d9dc5bb40924fbe0d11a3 (patch) | |
| tree | c227d4dc3915399662764abef984815f60f1ddf6 /qmake/main.cpp | |
| parent | d8b2998daeab9bfb7bfb5182960ec09b94885b17 (diff) | |
| download | qtbase-4e9cbfc90f6db09d865d9dc5bb40924fbe0d11a3.tar.gz qtbase-4e9cbfc90f6db09d865d9dc5bb40924fbe0d11a3.tar.bz2 qtbase-4e9cbfc90f6db09d865d9dc5bb40924fbe0d11a3.zip | |
Revert "move .qmake.cache search to Option"
We are now moving in the exact opposite direction.
This logically reverts commit 059200a44ba7177d0c9ec6bb5e6ee0b7e0c3f017.
Some adjustments were necessary to maintain the project root stuff.
Conflicts:
qmake/main.cpp
qmake/option.cpp
qmake/option.h
qmake/project.cpp
Change-Id: Ic14fa571cbbfe9ac159f92493e49741d70a87eff
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/main.cpp')
| -rw-r--r-- | qmake/main.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/qmake/main.cpp b/qmake/main.cpp index 985afaa8e8..38e09f60fd 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -163,11 +163,6 @@ int runQMake(int argc, char **argv) fn = fn.right(fn.length() - di - 1); } - if (!Option::prepareProject(fn)) { - exit_val = 3; - break; - } - // read project.. if(!project.read(fn)) { fprintf(stderr, "Error processing project file: %s\n", |