Commit 1d9d3885 authored by hjk's avatar hjk

Qt4ProjectManager: Rename {Qt4,Qmake}BuildConfiguration{Factory,}

Change-Id: Id49e347cc448f6a28271b6af775d56b6e00b4908
Reviewed-by: default avatarDavid Schulz <david.schulz@digia.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent 31d67d06
...@@ -188,8 +188,8 @@ bool AndroidDeployQtStep::init() ...@@ -188,8 +188,8 @@ bool AndroidDeployQtStep::init()
m_serialNumber = info.serialNumber; m_serialNumber = info.serialNumber;
} }
QmakeProjectManager::Qt4BuildConfiguration *bc QmakeProjectManager::QmakeBuildConfiguration *bc
= static_cast<QmakeProjectManager::Qt4BuildConfiguration *>(target()->activeBuildConfiguration()); = static_cast<QmakeProjectManager::QmakeBuildConfiguration *>(target()->activeBuildConfiguration());
if (m_signPackage) { if (m_signPackage) {
// check keystore and certificate passwords // check keystore and certificate passwords
......
...@@ -325,8 +325,8 @@ void AndroidDeployQtWidget::activeBuildConfigurationChanged() ...@@ -325,8 +325,8 @@ void AndroidDeployQtWidget::activeBuildConfigurationChanged()
disconnect(m_currentBuildConfiguration, SIGNAL(qmakeBuildConfigurationChanged()), disconnect(m_currentBuildConfiguration, SIGNAL(qmakeBuildConfigurationChanged()),
this, SLOT(updateSigningWarning())); this, SLOT(updateSigningWarning()));
updateSigningWarning(); updateSigningWarning();
QmakeProjectManager::Qt4BuildConfiguration *bc QmakeProjectManager::QmakeBuildConfiguration *bc
= qobject_cast<QmakeProjectManager::Qt4BuildConfiguration *>(m_step->target()->activeBuildConfiguration()); = qobject_cast<QmakeProjectManager::QmakeBuildConfiguration *>(m_step->target()->activeBuildConfiguration());
m_currentBuildConfiguration = bc; m_currentBuildConfiguration = bc;
if (bc) if (bc)
connect(bc, SIGNAL(qmakeBuildConfigurationChanged()), this, SLOT(updateSigningWarning())); connect(bc, SIGNAL(qmakeBuildConfigurationChanged()), this, SLOT(updateSigningWarning()));
...@@ -335,7 +335,7 @@ void AndroidDeployQtWidget::activeBuildConfigurationChanged() ...@@ -335,7 +335,7 @@ void AndroidDeployQtWidget::activeBuildConfigurationChanged()
void AndroidDeployQtWidget::updateSigningWarning() void AndroidDeployQtWidget::updateSigningWarning()
{ {
QmakeProjectManager::Qt4BuildConfiguration *bc = qobject_cast<QmakeProjectManager::Qt4BuildConfiguration *>(m_step->target()->activeBuildConfiguration()); QmakeProjectManager::QmakeBuildConfiguration *bc = qobject_cast<QmakeProjectManager::QmakeBuildConfiguration *>(m_step->target()->activeBuildConfiguration());
bool debug = bc && (bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild); bool debug = bc && (bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild);
if (m_step->signPackage() && debug) { if (m_step->signPackage() && debug) {
m_ui->signingDebugWarningIcon->setVisible(true); m_ui->signingDebugWarningIcon->setVisible(true);
......
...@@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE ...@@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE
namespace Ui { class AndroidDeployQtWidget; } namespace Ui { class AndroidDeployQtWidget; }
QT_END_NAMESPACE QT_END_NAMESPACE
namespace QmakeProjectManager { class Qt4BuildConfiguration; } namespace QmakeProjectManager { class QmakeBuildConfiguration; }
namespace Android { namespace Android {
namespace Internal { namespace Internal {
...@@ -85,7 +85,7 @@ private: ...@@ -85,7 +85,7 @@ private:
Ui::AndroidDeployQtWidget *m_ui; Ui::AndroidDeployQtWidget *m_ui;
AndroidDeployQtStep *m_step; AndroidDeployQtStep *m_step;
AndroidExtraLibraryListModel *m_extraLibraryListModel; AndroidExtraLibraryListModel *m_extraLibraryListModel;
QmakeProjectManager::Qt4BuildConfiguration *m_currentBuildConfiguration; QmakeProjectManager::QmakeBuildConfiguration *m_currentBuildConfiguration;
bool m_ignoreChange; bool m_ignoreChange;
}; };
......
...@@ -117,7 +117,7 @@ bool AndroidDeployStep::init() ...@@ -117,7 +117,7 @@ bool AndroidDeployStep::init()
if (!version) if (!version)
return false; return false;
const Qt4BuildConfiguration *bc = static_cast<Qt4BuildConfiguration *>(target()->activeBuildConfiguration()); const QmakeBuildConfiguration *bc = static_cast<QmakeBuildConfiguration *>(target()->activeBuildConfiguration());
if (!bc) if (!bc)
return false; return false;
......
...@@ -98,7 +98,7 @@ void AndroidPackageCreationStep::ctor() ...@@ -98,7 +98,7 @@ void AndroidPackageCreationStep::ctor()
bool AndroidPackageCreationStep::init() bool AndroidPackageCreationStep::init()
{ {
const Qt4BuildConfiguration *bc = qobject_cast<Qt4BuildConfiguration *>(target()->activeBuildConfiguration()); const QmakeBuildConfiguration *bc = qobject_cast<QmakeBuildConfiguration *>(target()->activeBuildConfiguration());
if (!bc) { if (!bc) {
raiseError(tr("Cannot create Android package: current build configuration is not Qt 4.")); raiseError(tr("Cannot create Android package: current build configuration is not Qt 4."));
return false; return false;
......
...@@ -182,7 +182,7 @@ void AndroidPackageCreationWidget::initGui() ...@@ -182,7 +182,7 @@ void AndroidPackageCreationWidget::initGui()
// Make the buildconfiguration emit a evironmentChanged() signal // Make the buildconfiguration emit a evironmentChanged() signal
// TODO find a better way // TODO find a better way
Qt4BuildConfiguration *bc = qobject_cast<Qt4BuildConfiguration *>(m_step->target()->activeBuildConfiguration()); QmakeBuildConfiguration *bc = qobject_cast<QmakeBuildConfiguration *>(m_step->target()->activeBuildConfiguration());
if (!bc) if (!bc)
return; return;
bool use = bc->useSystemEnvironment(); bool use = bc->useSystemEnvironment();
...@@ -196,7 +196,7 @@ void AndroidPackageCreationWidget::initGui() ...@@ -196,7 +196,7 @@ void AndroidPackageCreationWidget::initGui()
void AndroidPackageCreationWidget::updateSigningWarning() void AndroidPackageCreationWidget::updateSigningWarning()
{ {
Qt4BuildConfiguration *bc = qobject_cast<Qt4BuildConfiguration *>(m_step->target()->activeBuildConfiguration()); QmakeBuildConfiguration *bc = qobject_cast<QmakeBuildConfiguration *>(m_step->target()->activeBuildConfiguration());
bool debug = bc && (bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild); bool debug = bc && (bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild);
if (m_step->signPackage() && debug) { if (m_step->signPackage() && debug) {
m_ui->signingDebugWarningIcon->setVisible(true); m_ui->signingDebugWarningIcon->setVisible(true);
...@@ -213,7 +213,7 @@ void AndroidPackageCreationWidget::activeBuildConfigurationChanged() ...@@ -213,7 +213,7 @@ void AndroidPackageCreationWidget::activeBuildConfigurationChanged()
disconnect(m_currentBuildConfiguration, SIGNAL(qmakeBuildConfigurationChanged()), disconnect(m_currentBuildConfiguration, SIGNAL(qmakeBuildConfigurationChanged()),
this, SLOT(updateSigningWarning())); this, SLOT(updateSigningWarning()));
updateSigningWarning(); updateSigningWarning();
Qt4BuildConfiguration *bc = qobject_cast<Qt4BuildConfiguration *>(m_step->target()->activeBuildConfiguration()); QmakeBuildConfiguration *bc = qobject_cast<QmakeBuildConfiguration *>(m_step->target()->activeBuildConfiguration());
m_currentBuildConfiguration = bc; m_currentBuildConfiguration = bc;
if (bc) if (bc)
connect(bc, SIGNAL(qmakeBuildConfigurationChanged()), this, SLOT(updateSigningWarning())); connect(bc, SIGNAL(qmakeBuildConfigurationChanged()), this, SLOT(updateSigningWarning()));
...@@ -243,7 +243,7 @@ void AndroidPackageCreationWidget::updateAndroidProjectInfo() ...@@ -243,7 +243,7 @@ void AndroidPackageCreationWidget::updateAndroidProjectInfo()
void AndroidPackageCreationWidget::setTargetSDK(const QString &sdk) void AndroidPackageCreationWidget::setTargetSDK(const QString &sdk)
{ {
AndroidManager::setBuildTargetSDK(m_step->target(), sdk); AndroidManager::setBuildTargetSDK(m_step->target(), sdk);
Qt4BuildConfiguration *bc = qobject_cast<Qt4BuildConfiguration *>(m_step->target()->activeBuildConfiguration()); QmakeBuildConfiguration *bc = qobject_cast<QmakeBuildConfiguration *>(m_step->target()->activeBuildConfiguration());
if (!bc) if (!bc)
return; return;
QMakeStep *qs = bc->qmakeStep(); QMakeStep *qs = bc->qmakeStep();
......
...@@ -41,7 +41,7 @@ class QFileSystemWatcher; ...@@ -41,7 +41,7 @@ class QFileSystemWatcher;
namespace Ui { class AndroidPackageCreationWidget; } namespace Ui { class AndroidPackageCreationWidget; }
QT_END_NAMESPACE QT_END_NAMESPACE
namespace QmakeProjectManager { class Qt4BuildConfiguration; } namespace QmakeProjectManager { class QmakeBuildConfiguration; }
namespace Android { namespace Android {
namespace Internal { namespace Internal {
...@@ -112,7 +112,7 @@ private: ...@@ -112,7 +112,7 @@ private:
CheckModel *m_qtLibsModel; CheckModel *m_qtLibsModel;
CheckModel *m_prebundledLibs; CheckModel *m_prebundledLibs;
QFileSystemWatcher *m_fileSystemWatcher; QFileSystemWatcher *m_fileSystemWatcher;
QmakeProjectManager::Qt4BuildConfiguration *m_currentBuildConfiguration; QmakeProjectManager::QmakeBuildConfiguration *m_currentBuildConfiguration;
}; };
} // namespace Internal } // namespace Internal
......
...@@ -66,8 +66,8 @@ bool IosManager::supportsIos(ProjectExplorer::Target *target) ...@@ -66,8 +66,8 @@ bool IosManager::supportsIos(ProjectExplorer::Target *target)
QString IosManager::resDirForTarget(Target *target) QString IosManager::resDirForTarget(Target *target)
{ {
Qt4BuildConfiguration *bc = QmakeBuildConfiguration *bc =
qobject_cast<Qt4BuildConfiguration *>(target->activeBuildConfiguration()); qobject_cast<QmakeBuildConfiguration *>(target->activeBuildConfiguration());
return bc->buildDirectory().toString(); return bc->buildDirectory().toString();
} }
......
...@@ -167,8 +167,8 @@ Utils::FileName IosRunConfiguration::bundleDir() const ...@@ -167,8 +167,8 @@ Utils::FileName IosRunConfiguration::bundleDir() const
qDebug() << "unexpected device type in bundleDirForTarget: " << devType.toString(); qDebug() << "unexpected device type in bundleDirForTarget: " << devType.toString();
return res; return res;
} }
Qt4BuildConfiguration *bc = QmakeBuildConfiguration *bc =
qobject_cast<Qt4BuildConfiguration *>(target()->activeBuildConfiguration()); qobject_cast<QmakeBuildConfiguration *>(target()->activeBuildConfiguration());
if (bc) { if (bc) {
res = bc->buildDirectory(); res = bc->buildDirectory();
switch (bc->buildType()) { switch (bc->buildType()) {
......
...@@ -1076,7 +1076,7 @@ QVariantMap Version0Handler::convertBuildConfigurations(Project *project, const ...@@ -1076,7 +1076,7 @@ QVariantMap Version0Handler::convertBuildConfigurations(Project *project, const
if (id == QLatin1String("Qt4ProjectManager.Qt4BuildConfiguration") || if (id == QLatin1String("Qt4ProjectManager.Qt4BuildConfiguration") ||
id.startsWith(QLatin1String("Qt4ProjectManager.Qt4BuildConfiguration."))) { id.startsWith(QLatin1String("Qt4ProjectManager.Qt4BuildConfiguration."))) {
// Qt4BuildConfiguration: // QmakeBuildConfiguration:
if (i.key() == QLatin1String("QtVersionId")) { if (i.key() == QLatin1String("QtVersionId")) {
result.insert(QLatin1String("Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId"), result.insert(QLatin1String("Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId"),
i.value().toInt()); i.value().toInt());
...@@ -1099,7 +1099,7 @@ QVariantMap Version0Handler::convertBuildConfigurations(Project *project, const ...@@ -1099,7 +1099,7 @@ QVariantMap Version0Handler::convertBuildConfigurations(Project *project, const
result.insert(QLatin1String("Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory"), result.insert(QLatin1String("Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory"),
i.value()); i.value());
} else { } else {
qWarning() << "Unknown Qt4BuildConfiguration Key found:" << i.key() << i.value(); qWarning() << "Unknown QmakeBuildConfiguration Key found:" << i.key() << i.value();
} }
continue; continue;
} else if (id == QLatin1String("CMakeProjectManager.CMakeBuildConfiguration")) { } else if (id == QLatin1String("CMakeProjectManager.CMakeBuildConfiguration")) {
......
...@@ -82,7 +82,7 @@ void BlackBerryDeployConfiguration::ctor() ...@@ -82,7 +82,7 @@ void BlackBerryDeployConfiguration::ctor()
void BlackBerryDeployConfiguration::setupBarDescriptor() void BlackBerryDeployConfiguration::setupBarDescriptor()
{ {
QmakeProjectManager::Qt4BuildConfiguration *bc = qobject_cast<QmakeProjectManager::Qt4BuildConfiguration *>(target()->activeBuildConfiguration()); QmakeProjectManager::QmakeBuildConfiguration *bc = qobject_cast<QmakeProjectManager::QmakeBuildConfiguration *>(target()->activeBuildConfiguration());
if (!bc || !target()->kit()) if (!bc || !target()->kit())
return; return;
......
...@@ -39,7 +39,7 @@ class Target; ...@@ -39,7 +39,7 @@ class Target;
} }
namespace QmakeProjectManager { namespace QmakeProjectManager {
class Qt4BuildConfiguration; class QmakeBuildConfiguration;
class Qt4Project; class Qt4Project;
} }
...@@ -69,7 +69,7 @@ public: ...@@ -69,7 +69,7 @@ public:
QVariantMap toMap() const; QVariantMap toMap() const;
BlackBerryDeployConfiguration *deployConfiguration() const; BlackBerryDeployConfiguration *deployConfiguration() const;
QmakeProjectManager::Qt4BuildConfiguration *activeQt4BuildConfiguration() const; QmakeProjectManager::QmakeBuildConfiguration *activeQmakeBuildConfiguration() const;
QString key() const; QString key() const;
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <projectexplorer/runconfiguration.h> #include <projectexplorer/runconfiguration.h>
namespace QmakeProjectManager { namespace QmakeProjectManager {
class Qt4BuildConfiguration; class QmakeBuildConfiguration;
} }
namespace Qnx { namespace Qnx {
......
...@@ -97,9 +97,9 @@ MakeStep::~MakeStep() ...@@ -97,9 +97,9 @@ MakeStep::~MakeStep()
{ {
} }
Qt4BuildConfiguration *MakeStep::qt4BuildConfiguration() const QmakeBuildConfiguration *MakeStep::qmakeBuildConfiguration() const
{ {
return static_cast<Qt4BuildConfiguration *>(buildConfiguration()); return static_cast<QmakeBuildConfiguration *>(buildConfiguration());
} }
void MakeStep::setClean(bool clean) void MakeStep::setClean(bool clean)
...@@ -153,9 +153,9 @@ bool MakeStep::fromMap(const QVariantMap &map) ...@@ -153,9 +153,9 @@ bool MakeStep::fromMap(const QVariantMap &map)
bool MakeStep::init() bool MakeStep::init()
{ {
Qt4BuildConfiguration *bc = qt4BuildConfiguration(); QmakeBuildConfiguration *bc = qmakeBuildConfiguration();
if (!bc) if (!bc)
bc = qobject_cast<Qt4BuildConfiguration *>(target()->activeBuildConfiguration()); bc = qobject_cast<QmakeBuildConfiguration *>(target()->activeBuildConfiguration());
m_tasks.clear(); m_tasks.clear();
ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit()); ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit());
...@@ -197,7 +197,7 @@ bool MakeStep::init() ...@@ -197,7 +197,7 @@ bool MakeStep::init()
// for file builds, since the rules for that are // for file builds, since the rules for that are
// only in those files. // only in those files.
if (subNode->isDebugAndRelease() && bc->fileNodeBuild()) { if (subNode->isDebugAndRelease() && bc->fileNodeBuild()) {
if (bc->buildType() == Qt4BuildConfiguration::Debug) if (bc->buildType() == QmakeBuildConfiguration::Debug)
makefile += QLatin1String(".Debug"); makefile += QLatin1String(".Debug");
else else
makefile += QLatin1String(".Release"); makefile += QLatin1String(".Release");
...@@ -223,7 +223,7 @@ bool MakeStep::init() ...@@ -223,7 +223,7 @@ bool MakeStep::init()
if (objectsDir.isEmpty()) { if (objectsDir.isEmpty()) {
objectsDir = subNode->buildDir(bc); objectsDir = subNode->buildDir(bc);
if (subNode->isDebugAndRelease()) { if (subNode->isDebugAndRelease()) {
if (bc->buildType() == Qt4BuildConfiguration::Debug) if (bc->buildType() == QmakeBuildConfiguration::Debug)
objectsDir += QLatin1String("/debug"); objectsDir += QLatin1String("/debug");
else else
objectsDir += QLatin1String("/release"); objectsDir += QLatin1String("/release");
...@@ -395,9 +395,9 @@ void MakeStepConfigWidget::updateDetails() ...@@ -395,9 +395,9 @@ void MakeStepConfigWidget::updateDetails()
{ {
ToolChain *tc ToolChain *tc
= ToolChainKitInformation::toolChain(m_makeStep->target()->kit()); = ToolChainKitInformation::toolChain(m_makeStep->target()->kit());
Qt4BuildConfiguration *bc = m_makeStep->qt4BuildConfiguration(); QmakeBuildConfiguration *bc = m_makeStep->qmakeBuildConfiguration();
if (!bc) if (!bc)
bc = qobject_cast<Qt4BuildConfiguration *>(m_makeStep->target()->activeBuildConfiguration()); bc = qobject_cast<QmakeBuildConfiguration *>(m_makeStep->target()->activeBuildConfiguration());
if (tc && bc) if (tc && bc)
m_ui->makeLabel->setText(tr("Override %1:").arg(QDir::toNativeSeparators(tc->makeCommand(bc->environment())))); m_ui->makeLabel->setText(tr("Override %1:").arg(QDir::toNativeSeparators(tc->makeCommand(bc->environment()))));
......
...@@ -42,7 +42,7 @@ class Task; ...@@ -42,7 +42,7 @@ class Task;
namespace QmakeProjectManager { namespace QmakeProjectManager {
class Qt4BuildConfiguration; class QmakeBuildConfiguration;
class MakeStepConfigWidget; class MakeStepConfigWidget;
namespace Internal { namespace Internal {
...@@ -81,7 +81,7 @@ public: ...@@ -81,7 +81,7 @@ public:
explicit MakeStep(ProjectExplorer::BuildStepList *bsl); explicit MakeStep(ProjectExplorer::BuildStepList *bsl);
virtual ~MakeStep(); virtual ~MakeStep();
Qt4BuildConfiguration *qt4BuildConfiguration() const; QmakeBuildConfiguration *qmakeBuildConfiguration() const;
virtual bool init(); virtual bool init();
virtual void run(QFutureInterface<bool> &); virtual void run(QFutureInterface<bool> &);
......
...@@ -82,7 +82,7 @@ const char BUILD_CONFIGURATION_KEY[] = "Qt4ProjectManager.Qt4BuildConfiguration. ...@@ -82,7 +82,7 @@ const char BUILD_CONFIGURATION_KEY[] = "Qt4ProjectManager.Qt4BuildConfiguration.
enum { debug = 0 }; enum { debug = 0 };
Qt4BuildConfiguration::Qt4BuildConfiguration(Target *target) : QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target) :
BuildConfiguration(target, Core::Id(QT4_BC_ID)), BuildConfiguration(target, Core::Id(QT4_BC_ID)),
m_shadowBuild(true), m_shadowBuild(true),
m_isEnabled(false), m_isEnabled(false),
...@@ -93,7 +93,7 @@ Qt4BuildConfiguration::Qt4BuildConfiguration(Target *target) : ...@@ -93,7 +93,7 @@ Qt4BuildConfiguration::Qt4BuildConfiguration(Target *target) :
ctor(); ctor();
} }
Qt4BuildConfiguration::Qt4BuildConfiguration(Target *target, const Core::Id id) : QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, const Core::Id id) :
BuildConfiguration(target, id), BuildConfiguration(target, id),
m_shadowBuild(true), m_shadowBuild(true),
m_isEnabled(false), m_isEnabled(false),
...@@ -104,7 +104,7 @@ Qt4BuildConfiguration::Qt4BuildConfiguration(Target *target, const Core::Id id) ...@@ -104,7 +104,7 @@ Qt4BuildConfiguration::Qt4BuildConfiguration(Target *target, const Core::Id id)
ctor(); ctor();
} }
Qt4BuildConfiguration::Qt4BuildConfiguration(Target *target, Qt4BuildConfiguration *source) : QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, QmakeBuildConfiguration *source) :
BuildConfiguration(target, source), BuildConfiguration(target, source),
m_shadowBuild(source->m_shadowBuild), m_shadowBuild(source->m_shadowBuild),
m_isEnabled(false), m_isEnabled(false),
...@@ -116,11 +116,11 @@ Qt4BuildConfiguration::Qt4BuildConfiguration(Target *target, Qt4BuildConfigurati ...@@ -116,11 +116,11 @@ Qt4BuildConfiguration::Qt4BuildConfiguration(Target *target, Qt4BuildConfigurati
ctor(); ctor();
} }
Qt4BuildConfiguration::~Qt4BuildConfiguration() QmakeBuildConfiguration::~QmakeBuildConfiguration()
{ {
} }
QVariantMap Qt4BuildConfiguration::toMap() const QVariantMap QmakeBuildConfiguration::toMap() const
{ {
QVariantMap map(BuildConfiguration::toMap()); QVariantMap map(BuildConfiguration::toMap());
map.insert(QLatin1String(USE_SHADOW_BUILD_KEY), m_shadowBuild); map.insert(QLatin1String(USE_SHADOW_BUILD_KEY), m_shadowBuild);
...@@ -128,7 +128,7 @@ QVariantMap Qt4BuildConfiguration::toMap() const ...@@ -128,7 +128,7 @@ QVariantMap Qt4BuildConfiguration::toMap() const
return map; return map;
} }
bool Qt4BuildConfiguration::fromMap(const QVariantMap &map) bool QmakeBuildConfiguration::fromMap(const QVariantMap &map)
{ {
if (!BuildConfiguration::fromMap(map)) if (!BuildConfiguration::fromMap(map))
return false; return false;
...@@ -147,7 +147,7 @@ bool Qt4BuildConfiguration::fromMap(const QVariantMap &map) ...@@ -147,7 +147,7 @@ bool Qt4BuildConfiguration::fromMap(const QVariantMap &map)
return true; return true;
} }
void Qt4BuildConfiguration::ctor() void QmakeBuildConfiguration::ctor()
{ {
connect(this, SIGNAL(environmentChanged()), connect(this, SIGNAL(environmentChanged()),
this, SLOT(emitProFileEvaluateNeeded())); this, SLOT(emitProFileEvaluateNeeded()));
...@@ -155,12 +155,12 @@ void Qt4BuildConfiguration::ctor() ...@@ -155,12 +155,12 @@ void Qt4BuildConfiguration::ctor()
this, SLOT(kitChanged())); this, SLOT(kitChanged()));
} }
void Qt4BuildConfiguration::kitChanged() void QmakeBuildConfiguration::kitChanged()
{ {
LastKitState newState = LastKitState(target()->kit()); LastKitState newState = LastKitState(target()->kit());
if (newState != m_lastKitState) { if (newState != m_lastKitState) {
// This only checks if the ids have changed! // This only checks if the ids have changed!
// For that reason the Qt4BuildConfiguration is also connected // For that reason the QmakeBuildConfiguration is also connected
// to the toolchain and qtversion managers // to the toolchain and qtversion managers
emitProFileEvaluateNeeded(); emitProFileEvaluateNeeded();
updateShadowBuild(); updateShadowBuild();
...@@ -168,19 +168,19 @@ void Qt4BuildConfiguration::kitChanged() ...@@ -168,19 +168,19 @@ void Qt4BuildConfiguration::kitChanged()
} }
} }
void Qt4BuildConfiguration::toolChainUpdated(ProjectExplorer::ToolChain *tc) void QmakeBuildConfiguration::toolChainUpdated(ProjectExplorer::ToolChain *tc)
{ {
if (ToolChainKitInformation::toolChain(target()->kit()) == tc) if (ToolChainKitInformation::toolChain(target()->kit()) == tc)
emitProFileEvaluateNeeded(); emitProFileEvaluateNeeded();
} }
void Qt4BuildConfiguration::qtVersionsChanged(const QList<int> &,const QList<int> &, const QList<int> &changed) void QmakeBuildConfiguration::qtVersionsChanged(const QList<int> &,const QList<int> &, const QList<int> &changed)
{ {
if (changed.contains(QtKitInformation::qtVersionId(target()->kit()))) if (changed.contains(QtKitInformation::qtVersionId(target()->kit())))
emitProFileEvaluateNeeded(); emitProFileEvaluateNeeded();
} }
void Qt4BuildConfiguration::updateShadowBuild() void QmakeBuildConfiguration::updateShadowBuild()
{ {
// We also emit buildDirectoryChanged if the the Qt version's supportShadowBuild changed // We also emit buildDirectoryChanged if the the Qt version's supportShadowBuild changed
bool currentShadowBuild = supportsShadowBuilds(); bool currentShadowBuild = supportsShadowBuilds();
...@@ -191,19 +191,19 @@ void Qt4BuildConfiguration::updateShadowBuild() ...@@ -191,19 +191,19 @@ void Qt4BuildConfiguration::updateShadowBuild()
} }
} }
NamedWidget *Qt4BuildConfiguration::createConfigWidget() NamedWidget *QmakeBuildConfiguration::createConfigWidget()
{ {
return new Qt4ProjectConfigWidget(this); return new Qt4ProjectConfigWidget(this);
} }
QString Qt4BuildConfiguration::defaultShadowBuildDirectory() const QString QmakeBuildConfiguration::defaultShadowBuildDirectory() const
{ {
// todo displayName isn't ideal // todo displayName isn't ideal
return Qt4Project::shadowBuildDirectory(target()->project()->projectFilePath(), return Qt4Project::shadowBuildDirectory(target()->project()->projectFilePath(),
target()->kit(), displayName()); target()->kit(), displayName());
} }