diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-03-02 11:56:16 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-02 15:56:44 +0100 |
| commit | ab05682564da139a7b0bca6817854abc58486d49 (patch) | |
| tree | e4945b974a49a6c05d5c6faa1463cc98d00a62e5 /mkspecs/features/default_pre.prf | |
| parent | 08cc2d27794e6bafb75cdc35b6966def35f9facb (diff) | |
don't announce a dynamic .qmake.cache if we don't actually create one
otherwise we are breaking the "less hacky" configurations. whoops.
Change-Id: Ibb037753fbaf30beae3d30173be77d48b978b60b
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
Diffstat (limited to 'mkspecs/features/default_pre.prf')
| -rw-r--r-- | mkspecs/features/default_pre.prf | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 9e142f172d..59a7e4cb14 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -46,9 +46,10 @@ CONFIG = lex yacc warn_on debug uic resources $$CONFIG } else { error("Failed to run: $$MSG") } - unset(QTFWD) - unset(PRO_BASENAME) # 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) } |