summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/qt4projectmanager/qt4buildconfiguration.cpp')
-rw-r--r--src/plugins/qt4projectmanager/qt4buildconfiguration.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 6bccc16dcc..f84d8e5b4d 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()