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

don't announce a dynamic .qmake.cache if we don't actually create one

Browse Source 
otherwise we are breaking the "less hacky" configurations. whoops.

Change-Id: Ibb037753fbaf30beae3d30173be77d48b978b60b
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-03-02 11:56:16 +01:00 committed by Qt by Nokia
parent 08cc2d2779
commit ab05682564
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mkspecs/features/default_pre.prf
View File

@ -46,9 +46,10 @@ CONFIG = lex yacc warn_on debug uic resources $$CONFIG
} else { } else {
error("Failed to run: $$MSG") error("Failed to run: $$MSG")
} }
unset(QTFWD)
unset(PRO_BASENAME)
# Let qmake know about the unexpectedly appearing cache file. # Let qmake know about the unexpectedly appearing cache file.
_QMAKE_CACHE_ = $$QMAKE_SYNCQT_OUTDIR/.qmake.cache contains(QTFWD, -cache-module-fwd):_QMAKE_CACHE_ = $$QMAKE_SYNCQT_OUTDIR/.qmake.cache
unset(QTFWD)
unset(PRO_BASENAME)
} }