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> &);
......
......@@ -42,18 +42,18 @@ namespace QmakeProjectManager {
class QmakeBuildInfo;
class QMakeStep;
class MakeStep;
class Qt4BuildConfigurationFactory;
class QmakeBuildConfigurationFactory;
class Qt4ProFileNode;
namespace Internal { class Qt4ProjectConfigWidget; }
class QT4PROJECTMANAGER_EXPORT Qt4BuildConfiguration : public ProjectExplorer::BuildConfiguration
class QT4PROJECTMANAGER_EXPORT QmakeBuildConfiguration : public ProjectExplorer::BuildConfiguration
{
Q_OBJECT
public:
explicit Qt4BuildConfiguration(ProjectExplorer::Target *target);
~Qt4BuildConfiguration();
explicit QmakeBuildConfiguration(ProjectExplorer::Target *target);
~QmakeBuildConfiguration();
ProjectExplorer::NamedWidget *createConfigWidget();
bool isShadowBuild() const;
......@@ -119,8 +119,8 @@ private slots:
void qtVersionsChanged(const QList<int> &, const QList<int> &, const QList<int> &changed);
protected:
Qt4BuildConfiguration(ProjectExplorer::Target *target, Qt4BuildConfiguration *source);
Qt4BuildConfiguration(ProjectExplorer::Target *target, const Core::Id id);
QmakeBuildConfiguration(ProjectExplorer::Target *target, QmakeBuildConfiguration *source);
QmakeBuildConfiguration(ProjectExplorer::Target *target, const Core::Id id);
virtual bool fromMap(const QVariantMap &map);
private:
......@@ -152,16 +152,16 @@ private:
ProjectExplorer::FileNode *m_fileNodeBuild;
friend class Internal::Qt4ProjectConfigWidget;
friend class Qt4BuildConfigurationFactory;
friend class QmakeBuildConfigurationFactory;
};
class QT4PROJECTMANAGER_EXPORT Qt4BuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory
class QT4PROJECTMANAGER_EXPORT QmakeBuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory
{
Q_OBJECT
public:
explicit Qt4BuildConfigurationFactory(QObject *parent = 0);
~Qt4BuildConfigurationFactory();
explicit QmakeBuildConfigurationFactory(QObject *parent = 0);
~QmakeBuildConfigurationFactory();
int priority(const ProjectExplorer::Target *parent) const;
QList<ProjectExplorer::BuildInfo *> availableBuilds(const ProjectExplorer::Target *parent) const;
......
......@@ -42,7 +42,7 @@ namespace QmakeProjectManager {
class QmakeBuildInfo : public ProjectExplorer::BuildInfo
{
public:
QmakeBuildInfo(const Qt4BuildConfigurationFactory *f) : ProjectExplorer::BuildInfo(f) { }
QmakeBuildInfo(const QmakeBuildConfigurationFactory *f) : ProjectExplorer::BuildInfo(f) { }
ProjectExplorer::BuildConfiguration::BuildType type;
QString additionalArguments;
......
......@@ -2278,12 +2278,12 @@ QString Qt4ProFileNode::sourceDir() const
return m_projectDir;
}
QString Qt4ProFileNode::buildDir(Qt4BuildConfiguration *bc) const
QString Qt4ProFileNode::buildDir(QmakeBuildConfiguration *bc) const
{
const QDir srcDirRoot = m_project->rootQt4ProjectNode()->sourceDir();
const QString relativeDir = srcDirRoot.relativeFilePath(m_projectDir);
if (!bc && m_project->activeTarget())
bc = static_cast<Qt4BuildConfiguration *>(m_project->activeTarget()->activeBuildConfiguration());
bc = static_cast<QmakeBuildConfiguration *>(m_project->activeTarget()->activeBuildConfiguration());
if (!bc)
return QString();
return QDir::cleanPath(QDir(bc->buildDirectory().toString()).absoluteFilePath(relativeDir));
......
......@@ -64,7 +64,7 @@ class Project;
}
namespace QmakeProjectManager {
class Qt4BuildConfiguration;
class QmakeBuildConfiguration;
class Qt4ProFileNode;
class Qt4Project;
......@@ -378,7 +378,7 @@ public:
}
QString sourceDir() const;
QString buildDir(Qt4BuildConfiguration *bc = 0) const;
QString buildDir(QmakeBuildConfiguration *bc = 0) const;
QString uiDirectory() const;
static QString uiHeaderFile(const QString &uiDir, const QString &formFile);
......
......@@ -76,11 +76,11 @@ enum { debug = 0 };
namespace {
Qt4BuildConfiguration *enableActiveQt4BuildConfiguration(ProjectExplorer::Target *t, bool enabled)
QmakeBuildConfiguration *enableActiveQmakeBuildConfiguration(ProjectExplorer::Target *t, bool enabled)
{
if (!t)
return 0;
Qt4BuildConfiguration *bc = static_cast<Qt4BuildConfiguration *>(t->activeBuildConfiguration());
QmakeBuildConfiguration *bc = static_cast<QmakeBuildConfiguration *>(t->activeBuildConfiguration());
if (!bc)
return 0;
bc->setEnabled(enabled);
......@@ -648,7 +648,7 @@ void Qt4Project::update()
if (debug)
qDebug()<<"State is now Base";
m_asyncUpdateState = Base;
enableActiveQt4BuildConfiguration(activeTarget(), true);
enableActiveQmakeBuildConfiguration(activeTarget(), true);
updateBuildSystemData();
updateRunConfigurations();
emit proFilesEvaluated();
......@@ -678,7 +678,7 @@ void Qt4Project::scheduleAsyncUpdate(Qt4ProFileNode *node)
return;
}
enableActiveQt4BuildConfiguration(activeTarget(), false);
enableActiveQmakeBuildConfiguration(activeTarget(), false);
if (m_asyncUpdateState == AsyncFullUpdatePending) {
// Just postpone
......@@ -751,7 +751,7 @@ void Qt4Project::scheduleAsyncUpdate()
qDebug()<<" update in progress, canceling and setting state to full update pending";
m_cancelEvaluate = true;
m_asyncUpdateState = AsyncFullUpdatePending;
enableActiveQt4BuildConfiguration(activeTarget(), false);
enableActiveQmakeBuildConfiguration(activeTarget(), false);
m_rootProjectNode->setParseInProgressRecursive(true);
return;
}
......@@ -759,7 +759,7 @@ void Qt4Project::scheduleAsyncUpdate()
if (debug)
qDebug()<<" starting timer for full update, setting state to full update pending";
m_partialEvaluate.clear();
enableActiveQt4BuildConfiguration(activeTarget(), false);
enableActiveQmakeBuildConfiguration(activeTarget(), false);
m_rootProjectNode->setParseInProgressRecursive(true);
m_asyncUpdateState = AsyncFullUpdatePending;
m_asyncUpdateTimer.start();
......@@ -807,7 +807,7 @@ void Qt4Project::decrementPendingEvaluateFutures()
} else if (m_asyncUpdateState != ShuttingDown){
// After being done, we need to call:
m_asyncUpdateState = Base;
enableActiveQt4BuildConfiguration(activeTarget(), true);
enableActiveQmakeBuildConfiguration(activeTarget(), true);
updateFileList();
updateCodeModels();
updateBuildSystemData();
......@@ -946,7 +946,7 @@ void Qt4Project::proFileParseError(const QString &errorMessage)
Core::MessageManager::write(errorMessage);
}
QtSupport::ProFileReader *Qt4Project::createProFileReader(const Qt4ProFileNode *qt4ProFileNode, Qt4BuildConfiguration *bc)
QtSupport::ProFileReader *Qt4Project::createProFileReader(const Qt4ProFileNode *qt4ProFileNode, QmakeBuildConfiguration *bc)
{
if (!m_qmakeGlobals) {
m_qmakeGlobals = new ProFileGlobals;
......@@ -956,7 +956,7 @@ QtSupport::ProFileReader *Qt4Project::createProFileReader(const Qt4ProFileNode *
Utils::Environment env = Utils::Environment::systemEnvironment();
QStringList qmakeArgs;
if (!bc)
bc = activeTarget() ? static_cast<Qt4BuildConfiguration *>(activeTarget()->activeBuildConfiguration()) : 0;
bc = activeTarget() ? static_cast<QmakeBuildConfiguration *>(activeTarget()->activeBuildConfiguration()) : 0;
if (bc) {
k = bc->target()->kit();
......
......@@ -51,7 +51,7 @@ namespace QtSupport { class ProFileReader; }
namespace QmakeProjectManager {
class MakeStep;
class QMakeStep;
class Qt4BuildConfiguration;
class QmakeBuildConfiguration;
class Qt4Manager;
class Qt4PriFileNode;
class Qt4ProFileNode;
......@@ -101,7 +101,7 @@ public:
void notifyChanged(const QString &name);
/// \internal
QtSupport::ProFileReader *createProFileReader(const Qt4ProFileNode *qt4ProFileNode, Qt4BuildConfiguration *bc = 0);
QtSupport::ProFileReader *createProFileReader(const Qt4ProFileNode *qt4ProFileNode, QmakeBuildConfiguration *bc = 0);
/// \internal
ProFileGlobals *qmakeGlobals();
/// \internal
......
......@@ -43,7 +43,7 @@ using namespace QmakeProjectManager;
using namespace QmakeProjectManager::Internal;
using namespace ProjectExplorer;
Qt4ProjectConfigWidget::Qt4ProjectConfigWidget(Qt4BuildConfiguration *bc)
Qt4ProjectConfigWidget::Qt4ProjectConfigWidget(QmakeBuildConfiguration *bc)
: NamedWidget(),
m_buildConfiguration(bc),
m_ignoreChange(false)
......@@ -219,16 +219,16 @@ void Qt4ProjectConfigWidget::updateProblemLabel()
makefile.append(m_buildConfiguration->makefile());
switch (m_buildConfiguration->compareToImportFrom(makefile)) {
case Qt4BuildConfiguration::MakefileMatches:
case QmakeBuildConfiguration::MakefileMatches:
allGood = true;
break;
case Qt4BuildConfiguration::MakefileMissing:
case QmakeBuildConfiguration::MakefileMissing:
allGood = true;
break;
case Qt4BuildConfiguration::MakefileIncompatible:
case QmakeBuildConfiguration::MakefileIncompatible:
incompatibleBuild = true;
break;
case Qt4BuildConfiguration::MakefileForWrongProject:
case QmakeBuildConfiguration::MakefileForWrongProject:
targetMismatch = true;
break;
}
......
......@@ -41,7 +41,7 @@ namespace Utils {
}
namespace QmakeProjectManager {
class Qt4BuildConfiguration;
class QmakeBuildConfiguration;
class Qt4ProFileNode;
namespace Internal {
......@@ -53,7 +53,7 @@ class Qt4ProjectConfigWidget : public ProjectExplorer::NamedWidget
{
Q_OBJECT
public:
Qt4ProjectConfigWidget(Qt4BuildConfiguration *bc);
Qt4ProjectConfigWidget(QmakeBuildConfiguration *bc);
~Qt4ProjectConfigWidget();
private slots:
......@@ -73,7 +73,7 @@ private:
Ui::Qt4ProjectConfigWidget *m_ui;
QAbstractButton *m_browseButton;
Qt4BuildConfiguration *m_buildConfiguration;
QmakeBuildConfiguration *m_buildConfiguration;
Utils::DetailsWidget *m_detailsContainer;
QString m_defaultShadowBuildDir;
bool m_ignoreChange;
......
......@@ -112,7 +112,7 @@ QList<ProjectExplorer::BuildInfo *> QmakeProjectImporter::import(const Utils::Fi
QString additionalArguments = makefileBuildConfig.second;
Utils::FileName parsedSpec =
Qt4BuildConfiguration::extractSpecFromArguments(&additionalArguments, importPath.toString(), version);
QmakeBuildConfiguration::extractSpecFromArguments(&additionalArguments, importPath.toString(), version);
Utils::FileName versionSpec = version->mkspec();
if (parsedSpec.isEmpty() || parsedSpec == Utils::FileName::fromString(QLatin1String("default")))
parsedSpec = versionSpec;
......@@ -142,8 +142,8 @@ QList<ProjectExplorer::BuildInfo *> QmakeProjectImporter::import(const Utils::Fi
foreach (ProjectExplorer::Kit *k, kitList) {
addProject(k);
Qt4BuildConfigurationFactory *factory
= qobject_cast<Qt4BuildConfigurationFactory *>(
QmakeBuildConfigurationFactory *factory
= qobject_cast<QmakeBuildConfigurationFactory *>(
ProjectExplorer::IBuildConfigurationFactory::find(k, projectFilePath()));
if (!factory)
......
......@@ -205,7 +205,7 @@ void Qt4Manager::runQMake(ProjectExplorer::Project *p, ProjectExplorer::Node *no
!qt4pro->activeTarget()->activeBuildConfiguration())
return;
Qt4BuildConfiguration *bc = static_cast<Qt4BuildConfiguration *>(qt4pro->activeTarget()->activeBuildConfiguration());
QmakeBuildConfiguration *bc = static_cast<QmakeBuildConfiguration *>(qt4pro->activeTarget()->activeBuildConfiguration());
QMakeStep *qs = bc->qmakeStep();
if (!qs)
return;
......@@ -272,7 +272,7 @@ void Qt4Manager::handleSubDirContextMenu(Qt4Manager::Action action, bool isFileB
if (!contextNode || !contextFile)
isFileBuild = false;
Qt4BuildConfiguration *bc = qobject_cast<Qt4BuildConfiguration *>(qt4pro->activeTarget()->activeBuildConfiguration());
QmakeBuildConfiguration *bc = qobject_cast<QmakeBuildConfiguration *>(qt4pro->activeTarget()->activeBuildConfiguration());
if (!bc)
return;
......
......@@ -137,7 +137,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
addAutoReleasedObject(new QMakeStepFactory);
addAutoReleasedObject(new MakeStepFactory);
addAutoReleasedObject(new Qt4BuildConfigurationFactory);
addAutoReleasedObject(new QmakeBuildConfigurationFactory);
addAutoReleasedObject(new Qt4RunConfigurationFactory);
if (Utils::HostOsInfo::isMacHost())
......@@ -362,8 +362,8 @@ void Qt4ProjectManagerPlugin::updateContextActions(ProjectExplorer::Node *node,
m_buildSubProjectContextMenu->setParameter(subProjectName);
m_buildFileAction->setParameter(buildFilePossible ? QFileInfo(fileNode->path()).fileName() : QString());
Qt4BuildConfiguration *buildConfiguration = (qt4Project && qt4Project->activeTarget()) ?
static_cast<Qt4BuildConfiguration *>(qt4Project->activeTarget()->activeBuildConfiguration()) : 0;
QmakeBuildConfiguration *buildConfiguration = (qt4Project && qt4Project->activeTarget()) ?
static_cast<QmakeBuildConfiguration *>(qt4Project->activeTarget()->activeBuildConfiguration()) : 0;
bool isProjectNode = qt4Project && proFileNode && buildConfiguration;
bool isBuilding = BuildManager::isBuilding(project);
bool enabled = subProjectActionsVisible && !isBuilding;
......
......@@ -103,9 +103,9 @@ QMakeStep::~QMakeStep()
{
}
Qt4BuildConfiguration *QMakeStep::qt4BuildConfiguration() const
QmakeBuildConfiguration *QMakeStep::qmakeBuildConfiguration() const
{
return static_cast<Qt4BuildConfiguration *>(buildConfiguration());
return static_cast<QmakeBuildConfiguration *>(buildConfiguration());
}
///
......@@ -117,7 +117,7 @@ Qt4BuildConfiguration *QMakeStep::qt4BuildConfiguration() const
/// user arguments
QString QMakeStep::allArguments(bool shorted)
{
Qt4BuildConfiguration *bc = qt4BuildConfiguration();
QmakeBuildConfiguration *bc = qmakeBuildConfiguration();
QStringList arguments;
if (bc->subNodeBuild())
arguments << QDir::toNativeSeparators(bc->subNodeBuild()->path());
......@@ -231,7 +231,7 @@ QStringList QMakeStep::deducedArgumentsAfter()
bool QMakeStep::init()
{
Qt4BuildConfiguration *qt4bc = qt4BuildConfiguration();