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()
m_serialNumber = info.serialNumber;
}
QmakeProjectManager::Qt4BuildConfiguration *bc
= static_cast<QmakeProjectManager::Qt4BuildConfiguration *>(target()->activeBuildConfiguration());
QmakeProjectManager::QmakeBuildConfiguration *bc
= static_cast<QmakeProjectManager::QmakeBuildConfiguration *>(target()->activeBuildConfiguration());
if (m_signPackage) {
// check keystore and certificate passwords
......
......@@ -325,8 +325,8 @@ void AndroidDeployQtWidget::activeBuildConfigurationChanged()
disconnect(m_currentBuildConfiguration, SIGNAL(qmakeBuildConfigurationChanged()),
this, SLOT(updateSigningWarning()));
updateSigningWarning();
QmakeProjectManager::Qt4BuildConfiguration *bc
= qobject_cast<QmakeProjectManager::Qt4BuildConfiguration *>(m_step->target()->activeBuildConfiguration());
QmakeProjectManager::QmakeBuildConfiguration *bc
= qobject_cast<QmakeProjectManager::QmakeBuildConfiguration *>(m_step->target()->activeBuildConfiguration());
m_currentBuildConfiguration = bc;
if (bc)
connect(bc, SIGNAL(qmakeBuildConfigurationChanged()), this, SLOT(updateSigningWarning()));
......@@ -335,7 +335,7 @@ void AndroidDeployQtWidget::activeBuildConfigurationChanged()
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);
if (m_step->signPackage() && debug) {
m_ui->signingDebugWarningIcon->setVisible(true);
......
......@@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE
namespace Ui { class AndroidDeployQtWidget; }
QT_END_NAMESPACE
namespace QmakeProjectManager { class Qt4BuildConfiguration; }
namespace QmakeProjectManager { class QmakeBuildConfiguration; }
namespace Android {
namespace Internal {
......@@ -85,7 +85,7 @@ private:
Ui::AndroidDeployQtWidget *m_ui;
AndroidDeployQtStep *m_step;
AndroidExtraLibraryListModel *m_extraLibraryListModel;
QmakeProjectManager::Qt4BuildConfiguration *m_currentBuildConfiguration;
QmakeProjectManager::QmakeBuildConfiguration *m_currentBuildConfiguration;
bool m_ignoreChange;
};
......
......@@ -117,7 +117,7 @@ bool AndroidDeployStep::init()
if (!version)
return false;
const Qt4BuildConfiguration *bc = static_cast<Qt4BuildConfiguration *>(target()->activeBuildConfiguration());
const QmakeBuildConfiguration *bc = static_cast<QmakeBuildConfiguration *>(target()->activeBuildConfiguration());
if (!bc)
return false;
......
......@@ -98,7 +98,7 @@ void AndroidPackageCreationStep::ctor()
bool AndroidPackageCreationStep::init()
{
const Qt4BuildConfiguration *bc = qobject_cast<Qt4BuildConfiguration *>(target()->activeBuildConfiguration());
const QmakeBuildConfiguration *bc = qobject_cast<QmakeBuildConfiguration *>(target()->activeBuildConfiguration());
if (!bc) {
raiseError(tr("Cannot create Android package: current build configuration is not Qt 4."));
return false;
......
......@@ -182,7 +182,7 @@ void AndroidPackageCreationWidget::initGui()
// Make the buildconfiguration emit a evironmentChanged() signal
// 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)
return;
bool use = bc->useSystemEnvironment();
......@@ -196,7 +196,7 @@ void AndroidPackageCreationWidget::initGui()
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);
if (m_step->signPackage() && debug) {
m_ui->signingDebugWarningIcon->setVisible(true);
......@@ -213,7 +213,7 @@ void AndroidPackageCreationWidget::activeBuildConfigurationChanged()
disconnect(m_currentBuildConfiguration, SIGNAL(qmakeBuildConfigurationChanged()),
this, SLOT(updateSigningWarning()));
updateSigningWarning();
Qt4BuildConfiguration *bc = qobject_cast<Qt4BuildConfiguration *>(m_step->target()->activeBuildConfiguration());
QmakeBuildConfiguration *bc = qobject_cast<QmakeBuildConfiguration *>(m_step->target()->activeBuildConfiguration());
m_currentBuildConfiguration = bc;
if (bc)
connect(bc, SIGNAL(qmakeBuildConfigurationChanged()), this, SLOT(updateSigningWarning()));
......@@ -243,7 +243,7 @@ void AndroidPackageCreationWidget::updateAndroidProjectInfo()
void AndroidPackageCreationWidget::setTargetSDK(const QString &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)
return;
QMakeStep *qs = bc->qmakeStep();
......
......@@ -41,7 +41,7 @@ class QFileSystemWatcher;
namespace Ui { class AndroidPackageCreationWidget; }
QT_END_NAMESPACE
namespace QmakeProjectManager { class Qt4BuildConfiguration; }
namespace QmakeProjectManager { class QmakeBuildConfiguration; }
namespace Android {
namespace Internal {
......@@ -112,7 +112,7 @@ private:
CheckModel *m_qtLibsModel;
CheckModel *m_prebundledLibs;
QFileSystemWatcher *m_fileSystemWatcher;
QmakeProjectManager::Qt4BuildConfiguration *m_currentBuildConfiguration;
QmakeProjectManager::QmakeBuildConfiguration *m_currentBuildConfiguration;
};
} // namespace Internal
......
......@@ -66,8 +66,8 @@ bool IosManager::supportsIos(ProjectExplorer::Target *target)
QString IosManager::resDirForTarget(Target *target)
{
Qt4BuildConfiguration *bc =
qobject_cast<Qt4BuildConfiguration *>(target->activeBuildConfiguration());
QmakeBuildConfiguration *bc =
qobject_cast<QmakeBuildConfiguration *>(target->activeBuildConfiguration());
return bc->buildDirectory().toString();
}
......
......@@ -167,8 +167,8 @@ Utils::FileName IosRunConfiguration::bundleDir() const
qDebug() << "unexpected device type in bundleDirForTarget: " << devType.toString();
return res;
}
Qt4BuildConfiguration *bc =
qobject_cast<Qt4BuildConfiguration *>(target()->activeBuildConfiguration());
QmakeBuildConfiguration *bc =
qobject_cast<QmakeBuildConfiguration *>(target()->activeBuildConfiguration());
if (bc) {
res = bc->buildDirectory();
switch (bc->buildType()) {
......
......@@ -1076,7 +1076,7 @@ QVariantMap Version0Handler::convertBuildConfigurations(Project *project, const
if (id == QLatin1String("Qt4ProjectManager.Qt4BuildConfiguration") ||
id.startsWith(QLatin1String("Qt4ProjectManager.Qt4BuildConfiguration."))) {
// Qt4BuildConfiguration:
// QmakeBuildConfiguration:
if (i.key() == QLatin1String("QtVersionId")) {
result.insert(QLatin1String("Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId"),
i.value().toInt());
......@@ -1099,7 +1099,7 @@ QVariantMap Version0Handler::convertBuildConfigurations(Project *project, const
result.insert(QLatin1String("Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory"),
i.value());
} else {
qWarning() << "Unknown Qt4BuildConfiguration Key found:" << i.key() << i.value();
qWarning() << "Unknown QmakeBuildConfiguration Key found:" << i.key() << i.value();
}
continue;
} else if (id == QLatin1String("CMakeProjectManager.CMakeBuildConfiguration")) {
......
......@@ -82,7 +82,7 @@ void BlackBerryDeployConfiguration::ctor()
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())
return;
......
......@@ -39,7 +39,7 @@ class Target;
}
namespace QmakeProjectManager {
class Qt4BuildConfiguration;
class QmakeBuildConfiguration;
class Qt4Project;
}
......@@ -69,7 +69,7 @@ public:
QVariantMap toMap() const;
BlackBerryDeployConfiguration *deployConfiguration() const;
QmakeProjectManager::Qt4BuildConfiguration *activeQt4BuildConfiguration() const;
QmakeProjectManager::QmakeBuildConfiguration *activeQmakeBuildConfiguration() const;
QString key() const;
......
......@@ -35,7 +35,7 @@
#include <projectexplorer/runconfiguration.h>
namespace QmakeProjectManager {
class Qt4BuildConfiguration;
class QmakeBuildConfiguration;
}
namespace Qnx {
......
......@@ -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)
......@@ -153,9 +153,9 @@ bool MakeStep::fromMap(const QVariantMap &map)
bool MakeStep::init()
{
Qt4BuildConfiguration *bc = qt4BuildConfiguration();
QmakeBuildConfiguration *bc = qmakeBuildConfiguration();
if (!bc)
bc = qobject_cast<Qt4BuildConfiguration *>(target()->activeBuildConfiguration());
bc = qobject_cast<QmakeBuildConfiguration *>(target()->activeBuildConfiguration());
m_tasks.clear();
ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit());
......@@ -197,7 +197,7 @@ bool MakeStep::init()
// for file builds, since the rules for that are
// only in those files.
if (subNode->isDebugAndRelease() && bc->fileNodeBuild()) {
if (bc->buildType() == Qt4BuildConfiguration::Debug)
if (bc->buildType() == QmakeBuildConfiguration::Debug)
makefile += QLatin1String(".Debug");
else
makefile += QLatin1String(".Release");
......@@ -223,7 +223,7 @@ bool MakeStep::init()
if (objectsDir.isEmpty()) {
objectsDir = subNode->buildDir(bc);
if (subNode->isDebugAndRelease()) {
if (bc->buildType() == Qt4BuildConfiguration::Debug)
if (bc->buildType() == QmakeBuildConfiguration::Debug)
objectsDir += QLatin1String("/debug");
else
objectsDir += QLatin1String("/release");
......@@ -395,9 +395,9 @@ void MakeStepConfigWidget::updateDetails()
{
ToolChain *tc
= ToolChainKitInformation::toolChain(m_makeStep->target()->kit());
Qt4BuildConfiguration *bc = m_makeStep->qt4BuildConfiguration();
QmakeBuildConfiguration *bc = m_makeStep->qmakeBuildConfiguration();
if (!bc)
bc = qobject_cast<Qt4BuildConfiguration *>(m_makeStep->target()->activeBuildConfiguration());
bc = qobject_cast<QmakeBuildConfiguration *>(m_makeStep->target()->activeBuildConfiguration());
if (tc && bc)
m_ui->makeLabel->setText(tr("Override %1:").arg(QDir::toNativeSeparators(tc->makeCommand(bc->environment()))));
......
......@@ -42,7 +42,7 @@ class Task;
namespace QmakeProjectManager {
class Qt4BuildConfiguration;
class QmakeBuildConfiguration;
class MakeStepConfigWidget;
namespace Internal {
......@@ -81,7 +81,7 @@ public:
explicit MakeStep(ProjectExplorer::BuildStepList *bsl);
virtual ~MakeStep();
Qt4BuildConfiguration *qt4BuildConfiguration() const;
QmakeBuildConfiguration *qmakeBuildConfiguration() const;
virtual bool init();
virtual void run(QFutureInterface<bool> &);
......
......@@ -82,7 +82,7 @@ const char BUILD_CONFIGURATION_KEY[] = "Qt4ProjectManager.Qt4BuildConfiguration.
enum { debug = 0 };
Qt4BuildConfiguration::Qt4BuildConfiguration(Target *target) :
QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target) :
BuildConfiguration(target, Core::Id(QT4_BC_ID)),
m_shadowBuild(true),
m_isEnabled(false),
......@@ -93,7 +93,7 @@ Qt4BuildConfiguration::Qt4BuildConfiguration(Target *target) :
ctor();
}
Qt4BuildConfiguration::Qt4BuildConfiguration(Target *target, const Core::Id id) :
QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, const Core::Id id) :
BuildConfiguration(target, id),
m_shadowBuild(true),
m_isEnabled(false),
......@@ -104,7 +104,7 @@ Qt4BuildConfiguration::Qt4BuildConfiguration(Target *target, const Core::Id id)
ctor();
}
Qt4BuildConfiguration::Qt4BuildConfiguration(Target *target, Qt4BuildConfiguration *source) :
QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, QmakeBuildConfiguration *source) :
BuildConfiguration(target, source),
m_shadowBuild(source->m_shadowBuild),
m_isEnabled(false),
......@@ -116,11 +116,11 @@ Qt4BuildConfiguration::Qt4BuildConfiguration(Target *target, Qt4BuildConfigurati
ctor();
}
Qt4BuildConfiguration::~Qt4BuildConfiguration()
QmakeBuildConfiguration::~QmakeBuildConfiguration()
{
}
QVariantMap Qt4BuildConfiguration::toMap() const
QVariantMap QmakeBuildConfiguration::toMap() const
{
QVariantMap map(BuildConfiguration::toMap());
map.insert(QLatin1String(USE_SHADOW_BUILD_KEY), m_shadowBuild);
......@@ -128,7 +128,7 @@ QVariantMap Qt4BuildConfiguration::toMap() const
return map;
}
bool Qt4BuildConfiguration::fromMap(const QVariantMap &map)
bool QmakeBuildConfiguration::fromMap(const QVariantMap &map)
{
if (!BuildConfiguration::fromMap(map))
return false;
......@@ -147,7 +147,7 @@ bool Qt4BuildConfiguration::fromMap(const QVariantMap &map)
return true;
}
void Qt4BuildConfiguration::ctor()
void QmakeBuildConfiguration::ctor()
{
connect(this, SIGNAL(environmentChanged()),
this, SLOT(emitProFileEvaluateNeeded()));
......@@ -155,12 +155,12 @@ void Qt4BuildConfiguration::ctor()
this, SLOT(kitChanged()));
}
void Qt4BuildConfiguration::kitChanged()
void QmakeBuildConfiguration::kitChanged()
{
LastKitState newState = LastKitState(target()->kit());
if (newState != m_lastKitState) {
// 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
emitProFileEvaluateNeeded();
updateShadowBuild();
......@@ -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)
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())))
emitProFileEvaluateNeeded();
}
void Qt4BuildConfiguration::updateShadowBuild()
void QmakeBuildConfiguration::updateShadowBuild()
{
// We also emit buildDirectoryChanged if the the Qt version's supportShadowBuild changed
bool currentShadowBuild = supportsShadowBuilds();
......@@ -191,19 +191,19 @@ void Qt4BuildConfiguration::updateShadowBuild()
}
}
NamedWidget *Qt4BuildConfiguration::createConfigWidget()
NamedWidget *QmakeBuildConfiguration::createConfigWidget()
{
return new Qt4ProjectConfigWidget(this);
}
QString Qt4BuildConfiguration::defaultShadowBuildDirectory() const
QString QmakeBuildConfiguration::defaultShadowBuildDirectory() const
{
// todo displayName isn't ideal
return Qt4Project::shadowBuildDirectory(target()->project()->projectFilePath(),
target()->kit(), displayName());
}
bool Qt4BuildConfiguration::supportsShadowBuilds()
bool QmakeBuildConfiguration::supportsShadowBuilds()
{
BaseQtVersion *version = QtKitInformation::qtVersion(target()->kit());
return !version || version->supportsShadowBuilds();
......@@ -211,8 +211,8 @@ bool Qt4BuildConfiguration::supportsShadowBuilds()
/// If only a sub tree should be build this function returns which sub node
/// should be build
/// \see Qt4BuildConfiguration::setSubNodeBuild
Qt4ProFileNode *Qt4BuildConfiguration::subNodeBuild() const
/// \see QMakeBuildConfiguration::setSubNodeBuild
Qt4ProFileNode *QmakeBuildConfiguration::subNodeBuild() const
{
return m_subNodeBuild;
}
......@@ -223,17 +223,17 @@ Qt4ProFileNode *Qt4BuildConfiguration::subNodeBuild() const
/// calling BuildManager::buildProject( BuildConfiguration * )
/// and reset immediately afterwards
/// That is m_subNodesBuild is set only temporarly
void Qt4BuildConfiguration::setSubNodeBuild(Qt4ProFileNode *node)
void QmakeBuildConfiguration::setSubNodeBuild(Qt4ProFileNode *node)
{
m_subNodeBuild = node;
}
FileNode *Qt4BuildConfiguration::fileNodeBuild() const
FileNode *QmakeBuildConfiguration::fileNodeBuild() const
{
return m_fileNodeBuild;
}
void Qt4BuildConfiguration::setFileNodeBuild(FileNode *node)
void QmakeBuildConfiguration::setFileNodeBuild(FileNode *node)
{
m_fileNodeBuild = node;
}
......@@ -242,12 +242,12 @@ void Qt4BuildConfiguration::setFileNodeBuild(FileNode *node)
/// note, even if shadowBuild() returns true, it might be using the
/// source directory as the shadow build directory, thus it
/// still is a in-source build
bool Qt4BuildConfiguration::isShadowBuild() const
bool QmakeBuildConfiguration::isShadowBuild() const
{
return buildDirectory().toString() != target()->project()->projectDirectory();
}
void Qt4BuildConfiguration::setBuildDirectory(const FileName &directory)
void QmakeBuildConfiguration::setBuildDirectory(const FileName &directory)
{
if (directory == buildDirectory())
return;
......@@ -258,17 +258,17 @@ void Qt4BuildConfiguration::setBuildDirectory(const FileName &directory)
emitProFileEvaluateNeeded();
}
QString Qt4BuildConfiguration::makefile() const
QString QmakeBuildConfiguration::makefile() const
{
return static_cast<Qt4Project *>(target()->project())->rootQt4ProjectNode()->makefile();
}
BaseQtVersion::QmakeBuildConfigs Qt4BuildConfiguration::qmakeBuildConfiguration() const
BaseQtVersion::QmakeBuildConfigs QmakeBuildConfiguration::qmakeBuildConfiguration() const
{
return m_qmakeBuildConfiguration;
}
void Qt4BuildConfiguration::setQMakeBuildConfiguration(BaseQtVersion::QmakeBuildConfigs config)
void QmakeBuildConfiguration::setQMakeBuildConfiguration(BaseQtVersion::QmakeBuildConfigs config)
{
if (m_qmakeBuildConfiguration == config)
return;
......@@ -278,7 +278,7 @@ void Qt4BuildConfiguration::setQMakeBuildConfiguration(BaseQtVersion::QmakeBuild
emitProFileEvaluateNeeded();
}
void Qt4BuildConfiguration::emitProFileEvaluateNeeded()
void QmakeBuildConfiguration::emitProFileEvaluateNeeded()
{
Target *t = target();
Project *p = t->project();
......@@ -286,12 +286,12 @@ void Qt4BuildConfiguration::emitProFileEvaluateNeeded()
static_cast<Qt4Project *>(p)->scheduleAsyncUpdate();
}
void Qt4BuildConfiguration::emitQMakeBuildConfigurationChanged()
void QmakeBuildConfiguration::emitQMakeBuildConfigurationChanged()
{
emit qmakeBuildConfigurationChanged();
}
QStringList Qt4BuildConfiguration::configCommandLineArguments() const
QStringList QmakeBuildConfiguration::configCommandLineArguments() const
{
QStringList result;
BaseQtVersion *version = QtKitInformation::qtVersion(target()->kit());
......@@ -310,7 +310,7 @@ QStringList Qt4BuildConfiguration::configCommandLineArguments() const
return result;
}
QMakeStep *Qt4BuildConfiguration::qmakeStep() const
QMakeStep *QmakeBuildConfiguration::qmakeStep() const
{
QMakeStep *qs = 0;
BuildStepList *bsl = stepList(Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD));
......@@ -321,7 +321,7 @@ QMakeStep *Qt4BuildConfiguration::qmakeStep() const
return 0;
}
MakeStep *Qt4BuildConfiguration::makeStep() const
MakeStep *QmakeBuildConfiguration::makeStep() const
{
MakeStep *ms = 0;
BuildStepList *bsl = stepList(Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD));
......@@ -333,7 +333,7 @@ MakeStep *Qt4BuildConfiguration::makeStep() const
}
// Returns true if both are equal.
Qt4BuildConfiguration::MakefileState Qt4BuildConfiguration::compareToImportFrom(const QString &makefile)
QmakeBuildConfiguration::MakefileState QmakeBuildConfiguration::compareToImportFrom(const QString &makefile)
{
QMakeStep *qs = qmakeStep();
if (QFileInfo(makefile).exists() && qs) {
......@@ -413,7 +413,7 @@ Qt4BuildConfiguration::MakefileState Qt4BuildConfiguration::compareToImportFrom(
return MakefileMissing;
}
bool Qt4BuildConfiguration::removeQMLInspectorFromArguments(QString *args)
bool QmakeBuildConfiguration::removeQMLInspectorFromArguments(QString *args)
{
bool removedArgument = false;
for (QtcProcess::ArgIterator ait(args); ait.next(); ) {
......@@ -428,7 +428,7 @@ bool Qt4BuildConfiguration::removeQMLInspectorFromArguments(QString *args)
return removedArgument;
}
FileName Qt4BuildConfiguration::extractSpecFromArguments(QString *args,
FileName QmakeBuildConfiguration::extractSpecFromArguments(QString *args,
const QString &directory, const BaseQtVersion *version,
QStringList *outArgs)
{
......@@ -497,19 +497,19 @@ FileName Qt4BuildConfiguration::extractSpecFromArguments(QString *args,
return parsedSpec;
}
bool Qt4BuildConfiguration::isEnabled() const
bool QmakeBuildConfiguration::isEnabled() const
{
return m_isEnabled;
}
QString Qt4BuildConfiguration::disabledReason() const
QString QmakeBuildConfiguration::disabledReason() const
{
if (!m_isEnabled)
return tr("Parsing the .pro file");
return QString();
}
void Qt4BuildConfiguration::setEnabled(bool enabled)
void QmakeBuildConfiguration::setEnabled(bool enabled)
{
if (m_isEnabled == enabled)
return;
......@@ -518,10 +518,10 @@ void Qt4BuildConfiguration::setEnabled(bool enabled)
}
/*!
\class Qt4BuildConfigurationFactory
\class QmakeBuildConfigurationFactory
*/
Qt4BuildConfigurationFactory::Qt4BuildConfigurationFactory(QObject *parent) :
QmakeBuildConfigurationFactory::QmakeBuildConfigurationFactory(QObject *parent) :
IBuildConfigurationFactory(parent)
{
update();
......@@ -531,23 +531,23 @@ Qt4BuildConfigurationFactory::Qt4BuildConfigurationFactory(QObject *parent) :
this, SLOT(update()));
}
Qt4BuildConfigurationFactory::~Qt4BuildConfigurationFactory()
QmakeBuildConfigurationFactory::~QmakeBuildConfigurationFactory()
{
}
void Qt4BuildConfigurationFactory::update()
void QmakeBuildConfigurationFactory::update()
{
emit availableCreationIdsChanged();
}
bool Qt4BuildConfigurationFactory::canHandle(const Target *t) const
bool QmakeBuildConfigurationFactory::canHandle(const Target *t) const
{
if (!t->project()->supportsKit(t->kit()))
return false;
return qobject_cast<Qt4Project *>(t->project());
}
QmakeBuildInfo *Qt4BuildConfigurationFactory::createBuildInfo(const Kit *k,
QmakeBuildInfo *QmakeBuildConfigurationFactory::createBuildInfo(const Kit *k,
const QString &projectPath,
BuildConfiguration::BuildType type) const
{
......@@ -569,12 +569,12 @@ QmakeBuildInfo *Qt4BuildConfigurationFactory::createBuildInfo(const Kit *k,
return info;
}