From 9e60457d59e5bb9393f73ac64268142a1e8764d7 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 8 Jun 2012 17:56:45 +0200
Subject: [PATCH] add QMakeOption::do_cache

... because qmake has it.

Change-Id: Idc2c9f6a041ff1d60d95e8a2ad400f7d41f3d2d2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
---
 src/shared/proparser/qmakeevaluator.cpp | 2 ++
 src/shared/proparser/qmakeglobals.cpp   | 2 ++
 src/shared/proparser/qmakeglobals.h     | 1 +
 3 files changed, 5 insertions(+)

diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp
index 7b6caa4d513..0a66b42b340 100644
--- a/src/shared/proparser/qmakeevaluator.cpp
+++ b/src/shared/proparser/qmakeevaluator.cpp
@@ -914,6 +914,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile(
                 // ### init QMAKE_EXT_{C,H,CPP,OBJ}
                 // ### init TEMPLATE_PREFIX
 
+              if (m_option->do_cache) {
                 QString qmake_cache = m_option->cachefile;
                 if (qmake_cache.isEmpty() && !m_outputDir.isEmpty())  { //find it as it has not been specified
                     QDir dir(m_outputDir);
@@ -941,6 +942,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile(
                     }
                 }
                 m_option->cachefile = qmake_cache;
+              }
 
                 loadSpec();
 
diff --git a/src/shared/proparser/qmakeglobals.cpp b/src/shared/proparser/qmakeglobals.cpp
index b5cf486b3d5..9ccca0c330a 100644
--- a/src/shared/proparser/qmakeglobals.cpp
+++ b/src/shared/proparser/qmakeglobals.cpp
@@ -93,6 +93,8 @@ QMakeGlobals::QMakeGlobals()
 {
     initStatics();
 
+    do_cache = true;
+
 #ifdef Q_OS_WIN
     dirlist_sep = QLatin1Char(';');
     dir_sep = QLatin1Char('\\');
diff --git a/src/shared/proparser/qmakeglobals.h b/src/shared/proparser/qmakeglobals.h
index 9e63ae5105d..0835f7b7fef 100644
--- a/src/shared/proparser/qmakeglobals.h
+++ b/src/shared/proparser/qmakeglobals.h
@@ -56,6 +56,7 @@ public:
     QMakeGlobals();
     ~QMakeGlobals();
 
+    bool do_cache;
     QString dir_sep;
     QString dirlist_sep;
     QString qmakespec;