Commit 89b28ef2 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

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: default avatarDaniel Teske <daniel.teske@digia.com>
parent 1f8cb204
......@@ -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()
......
......@@ -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
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment