From ab05682564da139a7b0bca6817854abc58486d49 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 2 Mar 2012 11:56:16 +0100
Subject: 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>
---
 mkspecs/features/default_pre.prf | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'mkspecs/features/default_pre.prf')

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)
 }
-- 
cgit v1.2.3