From 89b28ef2497fb90c3bde39fc994e6876fb0bb513 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Fri, 6 Sep 2013 12:19:38 +0200
Subject: [PATCH] Qmake: Rename emitBuildDirectoryChanged()

The method is used to reset the build directory if shadow building
becomes unavailable due to the Qt version changing. It does not
explicitly emit anything anymore.

Change-Id: I27b46b77f334be62f4db5f269529f8a2d62d834b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
 .../qt4projectmanager/qt4buildconfiguration.cpp    | 14 +++++++-------
 .../qt4projectmanager/qt4buildconfiguration.h      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 6bccc16dcc6..f84d8e5b4dd 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -148,7 +148,7 @@ void Qt4BuildConfiguration::kitChanged()
         // For that reason the Qt4BuildConfiguration is also connected
         // to the toolchain and qtversion managers
         emitProFileEvaluateNeeded();
-        emitBuildDirectoryChanged();
+        updateShadowBuild();
         m_lastKitState = newState;
     }
 }
@@ -165,15 +165,15 @@ void Qt4BuildConfiguration::qtVersionsChanged(const QList<int> &,const QList<int
         emitProFileEvaluateNeeded();
 }
 
-bool Qt4BuildConfiguration::emitBuildDirectoryChanged()
+void Qt4BuildConfiguration::updateShadowBuild()
 {
     // We also emit buildDirectoryChanged if the the Qt version's supportShadowBuild changed
-    if (supportsShadowBuilds() != m_qtVersionSupportsShadowBuilds) {
-        m_qtVersionSupportsShadowBuilds = supportsShadowBuilds();
-        emit buildDirectoryChanged();
-        return true;
+    bool currentShadowBuild = supportsShadowBuilds();
+    if (currentShadowBuild != m_qtVersionSupportsShadowBuilds) {
+        if (!currentShadowBuild)
+            setBuildDirectory(Utils::FileName::fromString(target()->project()->projectDirectory()));
+        m_qtVersionSupportsShadowBuilds = currentShadowBuild;
     }
-    return false;
 }
 
 NamedWidget *Qt4BuildConfiguration::createConfigWidget()
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.h b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
index b12dcaa1326..b6256df57bf 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
@@ -125,7 +125,6 @@ private slots:
     void kitChanged();
     void toolChainUpdated(ProjectExplorer::ToolChain *tc);
     void qtVersionsChanged(const QList<int> &, const QList<int> &, const QList<int> &changed);
-    bool emitBuildDirectoryChanged();
 
 protected:
     Qt4BuildConfiguration(ProjectExplorer::Target *target, Qt4BuildConfiguration *source);
@@ -136,6 +135,7 @@ private:
     void ctor();
     QString defaultShadowBuildDirectory() const;
     void setBuildDirectory(const Utils::FileName &directory);
+    void updateShadowBuild();
 
     class LastKitState
     {