1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "make default_pro.prf advertize dynamically created .qmake.cache"

Browse Source 
... 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>
This commit is contained in:
Oswald Buddenhagen 2012-05-09 18:39:05 +02:00
parent 4e9cbfc90f
commit 528192a78b
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mkspecs/features/default_pre.prf
View File

@ -47,9 +47,6 @@ CONFIG = lex yacc warn_on debug uic resources exceptions $$CONFIG
error("Failed to run: $$MSG") 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(QTFWD)
unset(PRO_BASENAME) unset(PRO_BASENAME)
} }

2
qmake/project.cpp
View File

@ -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! if(var == "REQUIRES") // special case to get communicated to backends!
doProjectCheckReqs(vallist, place); doProjectCheckReqs(vallist, place);
else if (var == "_QMAKE_CACHE_")
Option::mkfile::cachefile = varlist.isEmpty() ? QString() : varlist.at(0);
} }
return true; return true;
} }