don't announce a dynamic .qmake.cache if we don't actually create one
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Fri, 2 Mar 2012 10:56:16 +0000 (11:56 +0100)
committerQt by Nokia <qt-info@nokia.com>
Fri, 2 Mar 2012 14:56:44 +0000 (15:56 +0100)
otherwise we are breaking the "less hacky" configurations. whoops.

Change-Id: Ibb037753fbaf30beae3d30173be77d48b978b60b
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
mkspecs/features/default_pre.prf

index 9e142f1..59a7e4c 100644 (file)
@@ -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)
 }