diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-05-09 18:39:05 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:37:49 +0200 |
| commit | 528192a78b3250964ee99efab42b6683da02eb11 (patch) | |
| tree | 9845cd37f0dad4a01eb9048239921d158ffcd92e | |
| parent | 4e9cbfc90f6db09d865d9dc5bb40924fbe0d11a3 (diff) | |
Revert "make default_pro.prf advertize dynamically created .qmake.cache"
... and followup fixes.
this is not needed any more due to the breaking patch being reverted.
Change-Id: Ia3416fcc16ddece680efbd0322286a601879fa0a
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| -rw-r--r-- | mkspecs/features/default_pre.prf | 3 | ||||
| -rw-r--r-- | qmake/project.cpp | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 2876e7d29e..250ac0e9b8 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -47,9 +47,6 @@ CONFIG = lex yacc warn_on debug uic resources exceptions $$CONFIG error("Failed to run: $$MSG") } - # Let qmake know about the unexpectedly appearing cache file. - exists($$QMAKE_SYNCQT_OUTDIR/.qmake.cache):_QMAKE_CACHE_ = $$QMAKE_SYNCQT_OUTDIR/.qmake.cache - unset(QTFWD) unset(PRO_BASENAME) } diff --git a/qmake/project.cpp b/qmake/project.cpp index 283dee13c8..4d4dfe955e 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1187,8 +1187,6 @@ QMakeProject::parse(const QString &t, QHash<QString, QStringList> &place, int nu } if(var == "REQUIRES") // special case to get communicated to backends! doProjectCheckReqs(vallist, place); - else if (var == "_QMAKE_CACHE_") - Option::mkfile::cachefile = varlist.isEmpty() ? QString() : varlist.at(0); } return true; } |