feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
Change-Id: Id49e347cc448f6a28271b6af775d56b6e00b4908
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2013-10-16 14:00:45 +02:00
parent 31d67d0600
commit 1d9d3885b4
29 changed files with 158 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/android/androiddeployqtstep.cpp
+2 -2
View File
@@ -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
src/plugins/android/androiddeployqtwidget.cpp
+3 -3
View File
@@ -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);
src/plugins/android/androiddeployqtwidget.h
+2 -2
View File
@@ -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;
};
src/plugins/android/androiddeploystep.cpp
+1 -1
View File
@@ -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;
src/plugins/android/androidpackagecreationstep.cpp
+1 -1
View File
@@ -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;
src/plugins/android/androidpackagecreationwidget.cpp
+4 -4
View File
@@ -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();
src/plugins/android/androidpackagecreationwidget.h
+2 -2
View File
@@ -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
src/plugins/ios/iosmanager.cpp
+2 -2
View File
@@ -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();
}
src/plugins/ios/iosrunconfiguration.cpp
+2 -2
View File
@@ -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()) {
src/plugins/projectexplorer/settingsaccessor.cpp
+2 -2
View File
@@ -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")) {
src/plugins/qnx/blackberrydeployconfiguration.cpp
+1 -1
View File
@@ -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;
src/plugins/qnx/blackberryrunconfiguration.h
+2 -2
View File
@@ -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;
src/plugins/qnx/blackberryruncontrol.h
+1 -1
View File
@@ -35,7 +35,7 @@
#include <projectexplorer/runconfiguration.h>
namespace QmakeProjectManager {
class Qt4BuildConfiguration;
class QmakeBuildConfiguration;
}
namespace Qnx {
src/plugins/qt4projectmanager/makestep.cpp
+8 -8
View File
@@ -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()))));
src/plugins/qt4projectmanager/makestep.h
+2 -2
View File
@@ -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> &);
src/plugins/qt4projectmanager/qmakebuildconfiguration.cpp
+62 -62
View File
@@ -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;
}
int Qt4BuildConfigurationFactory::priority(const Target *parent) const
int QmakeBuildConfigurationFactory::priority(const Target *parent) const
{
return canHandle(parent) ? 0 : -1;
}
QList<BuildInfo *> Qt4BuildConfigurationFactory::availableBuilds(const Target *parent) const
QList<BuildInfo *> QmakeBuildConfigurationFactory::availableBuilds(const Target *parent) const
{
QList<ProjectExplorer::BuildInfo *> result;
QmakeBuildInfo *info = createBuildInfo(parent->kit(), parent->project()->projectFilePath(),
@@ -586,13 +586,13 @@ QList<BuildInfo *> Qt4BuildConfigurationFactory::availableBuilds(const Target *p
return result;
}
int Qt4BuildConfigurationFactory::priority(const Kit *k, const QString &projectPath) const
int QmakeBuildConfigurationFactory::priority(const Kit *k, const QString &projectPath) const
{
return (k && Core::MimeDatabase::findByFile(QFileInfo(projectPath))
.matchesType(QLatin1String(Constants::PROFILE_MIMETYPE))) ? 0 : -1;
}
QList<BuildInfo *> Qt4BuildConfigurationFactory::availableSetups(const Kit *k, const QString &projectPath) const
QList<BuildInfo *> QmakeBuildConfigurationFactory::availableSetups(const Kit *k, const QString &projectPath) const
{
QList<ProjectExplorer::BuildInfo *> result;
result << createBuildInfo(k, projectPath, ProjectExplorer::BuildConfiguration::Debug);
@@ -601,7 +601,7 @@ QList<BuildInfo *> Qt4BuildConfigurationFactory::availableSetups(const Kit *k, c
return result;
}
BuildConfiguration *Qt4BuildConfigurationFactory::create(Target *parent, const BuildInfo *info) const
BuildConfiguration *QmakeBuildConfigurationFactory::create(Target *parent, const BuildInfo *info) const
{
QTC_ASSERT(info->factory() == this, return 0);
QTC_ASSERT(info->kitId == parent->kit()->id(), return 0);
@@ -618,7 +618,7 @@ BuildConfiguration *Qt4BuildConfigurationFactory::create(Target *parent, const B
else
config |= QtSupport::BaseQtVersion::DebugBuild;
Qt4BuildConfiguration *bc = new Qt4BuildConfiguration(parent);
QmakeBuildConfiguration *bc = new QmakeBuildConfiguration(parent);
bc->setDefaultDisplayName(info->displayName);
bc->setDisplayName(info->displayName);
@@ -641,7 +641,7 @@ BuildConfiguration *Qt4BuildConfigurationFactory::create(Target *parent, const B
QString additionalArguments = qmakeInfo->additionalArguments;
bool enableQmlDebugger
= Qt4BuildConfiguration::removeQMLInspectorFromArguments(&additionalArguments);
= QmakeBuildConfiguration::removeQMLInspectorFromArguments(&additionalArguments);
if (!additionalArguments.isEmpty())
qmakeStep->setUserArguments(additionalArguments);
qmakeStep->setLinkQmlDebuggingLibrary(enableQmlDebugger);
@@ -659,38 +659,38 @@ BuildConfiguration *Qt4BuildConfigurationFactory::create(Target *parent, const B
return bc;
}
bool Qt4BuildConfigurationFactory::canClone(const Target *parent, BuildConfiguration *source) const
bool QmakeBuildConfigurationFactory::canClone(const Target *parent, BuildConfiguration *source) const
{
return canHandle(parent) && qobject_cast<Qt4BuildConfiguration *>(source);
return canHandle(parent) && qobject_cast<QmakeBuildConfiguration *>(source);
}
BuildConfiguration *Qt4BuildConfigurationFactory::clone(Target *parent, BuildConfiguration *source)
BuildConfiguration *QmakeBuildConfigurationFactory::clone(Target *parent, BuildConfiguration *source)
{
if (!canClone(parent, source))
return 0;
Qt4BuildConfiguration *oldbc(static_cast<Qt4BuildConfiguration *>(source));
return new Qt4BuildConfiguration(parent, oldbc);
QmakeBuildConfiguration *oldbc(static_cast<QmakeBuildConfiguration *>(source));
return new QmakeBuildConfiguration(parent, oldbc);
}
bool Qt4BuildConfigurationFactory::canRestore(const Target *parent, const QVariantMap &map) const
bool QmakeBuildConfigurationFactory::canRestore(const Target *parent, const QVariantMap &map) const
{
if (!canHandle(parent))
return false;
return ProjectExplorer::idFromMap(map) == QT4_BC_ID;
}
BuildConfiguration *Qt4BuildConfigurationFactory::restore(Target *parent, const QVariantMap &map)
BuildConfiguration *QmakeBuildConfigurationFactory::restore(Target *parent, const QVariantMap &map)
{
if (!canRestore(parent, map))
return 0;
Qt4BuildConfiguration *bc = new Qt4BuildConfiguration(parent);
QmakeBuildConfiguration *bc = new QmakeBuildConfiguration(parent);
if (bc->fromMap(map))
return bc;
delete bc;
return 0;
}
BuildConfiguration::BuildType Qt4BuildConfiguration::buildType() const
BuildConfiguration::BuildType QmakeBuildConfiguration::buildType() const
{
if (qmakeBuildConfiguration() & BaseQtVersion::DebugBuild)
return Debug;
@@ -698,12 +698,12 @@ BuildConfiguration::BuildType Qt4BuildConfiguration::buildType() const
return Release;
}
Qt4BuildConfiguration::LastKitState::LastKitState()
QmakeBuildConfiguration::LastKitState::LastKitState()
{
}
Qt4BuildConfiguration::LastKitState::LastKitState(Kit *k)
QmakeBuildConfiguration::LastKitState::LastKitState(Kit *k)
: m_qtVersion(QtKitInformation::qtVersionId(k)),
m_sysroot(SysRootKitInformation::sysRoot(k).toString()),
m_mkspec(QmakeKitInformation::mkspec(k).toString())
@@ -712,7 +712,7 @@ Qt4BuildConfiguration::LastKitState::LastKitState(Kit *k)
m_toolchain = tc ? tc->id() : QString();
}
bool Qt4BuildConfiguration::LastKitState::operator ==(const LastKitState &other) const
bool QmakeBuildConfiguration::LastKitState::operator ==(const LastKitState &other) const
{
return m_qtVersion == other.m_qtVersion
&& m_toolchain == other.m_toolchain
@@ -720,7 +720,7 @@ bool Qt4BuildConfiguration::LastKitState::operator ==(const LastKitState &other)
&& m_mkspec == other.m_mkspec;
}
bool Qt4BuildConfiguration::LastKitState::operator !=(const LastKitState &other) const
bool QmakeBuildConfiguration::LastKitState::operator !=(const LastKitState &other) const
{
return !operator ==(other);
}
src/plugins/qt4projectmanager/qmakebuildconfiguration.h
+10 -10
View File
@@ -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;
src/plugins/qt4projectmanager/qmakebuildinfo.h
+1 -1
View File
@@ -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;
src/plugins/qt4projectmanager/qmakenodes.cpp
+2 -2
View File
@@ -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));
src/plugins/qt4projectmanager/qmakenodes.h
+2 -2
View File
@@ -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);
src/plugins/qt4projectmanager/qmakeproject.cpp
+9 -9
View File
@@ -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();
src/plugins/qt4projectmanager/qmakeproject.h
+2 -2
View File
@@ -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
src/plugins/qt4projectmanager/qmakeprojectconfigwidget.cpp
+5 -5
View File
@@ -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;
}
src/plugins/qt4projectmanager/qmakeprojectconfigwidget.h
+3 -3
View File
@@ -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;
src/plugins/qt4projectmanager/qmakeprojectimporter.cpp
+3 -3
View File
@@ -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)
src/plugins/qt4projectmanager/qmakeprojectmanager.cpp
+2 -2
View File
@@ -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;
src/plugins/qt4projectmanager/qmakeprojectmanagerplugin.cpp
+3 -3
View File
@@ -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;
src/plugins/qt4projectmanager/qmakestep.cpp
+17 -17
View File
@@ -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();
QmakeBuildConfiguration *qt4bc = qmakeBuildConfiguration();
const QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(target()->kit());
if (!qtVersion)
@@ -262,7 +262,7 @@ bool QMakeStep::init()
}
// Check whether we need to run qmake
bool makefileOutDated = (qt4bc->compareToImportFrom(makefile) != Qt4BuildConfiguration::MakefileMatches);
bool makefileOutDated = (qt4bc->compareToImportFrom(makefile) != QmakeBuildConfiguration::MakefileMatches);
if (m_forced || makefileOutDated)
m_needToRunQMake = true;
m_forced = false;
@@ -353,7 +353,7 @@ bool QMakeStep::processSucceeded(int exitCode, QProcess::ExitStatus status)
bool result = AbstractProcessStep::processSucceeded(exitCode, status);
if (!result)
m_needToRunQMake = true;
Qt4Project *project = static_cast<Qt4Project *>(qt4BuildConfiguration()->target()->project());
Qt4Project *project = static_cast<Qt4Project *>(qmakeBuildConfiguration()->target()->project());
project->emitBuildDirectoryInitialized();
return result;
}
@@ -366,8 +366,8 @@ void QMakeStep::setUserArguments(const QString &arguments)
emit userArgumentsChanged();
qt4BuildConfiguration()->emitQMakeBuildConfigurationChanged();
qt4BuildConfiguration()->emitProFileEvaluateNeeded();
qmakeBuildConfiguration()->emitQMakeBuildConfigurationChanged();
qmakeBuildConfiguration()->emitProFileEvaluateNeeded();
}
bool QMakeStep::linkQmlDebuggingLibrary() const
@@ -376,7 +376,7 @@ bool QMakeStep::linkQmlDebuggingLibrary() const
return true;
if (m_linkQmlDebuggingLibrary == DoNotLink)
return false;
return (qt4BuildConfiguration()->buildType() & BuildConfiguration::Debug);
return (qmakeBuildConfiguration()->buildType() & BuildConfiguration::Debug);
}
void QMakeStep::setLinkQmlDebuggingLibrary(bool enable)
@@ -388,8 +388,8 @@ void QMakeStep::setLinkQmlDebuggingLibrary(bool enable)
emit linkQmlDebuggingLibraryChanged();
qt4BuildConfiguration()->emitQMakeBuildConfigurationChanged();
qt4BuildConfiguration()->emitProFileEvaluateNeeded();
qmakeBuildConfiguration()->emitQMakeBuildConfigurationChanged();
qmakeBuildConfiguration()->emitProFileEvaluateNeeded();
}
QStringList QMakeStep::parserArguments()
@@ -476,7 +476,7 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step)
this, SLOT(userArgumentsChanged()));
connect(step, SIGNAL(linkQmlDebuggingLibraryChanged()),
this, SLOT(linkQmlDebuggingLibraryChanged()));
connect(step->qt4BuildConfiguration(), SIGNAL(qmakeBuildConfigurationChanged()),
connect(step->qmakeBuildConfiguration(), SIGNAL(qmakeBuildConfigurationChanged()),
this, SLOT(qmakeBuildConfigChanged()));
connect(step->target(), SIGNAL(kitChanged()), this, SLOT(qtVersionChanged()));
connect(QtSupport::QtVersionManager::instance(), SIGNAL(dumpUpdatedFor(Utils::FileName)),
@@ -512,7 +512,7 @@ void QMakeStepConfigWidget::qtVersionChanged()
void QMakeStepConfigWidget::qmakeBuildConfigChanged()
{
Qt4BuildConfiguration *bc = m_step->qt4BuildConfiguration();
QmakeBuildConfiguration *bc = m_step->qmakeBuildConfiguration();
bool debug = bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild;
m_ignoreChange = true;
m_ui->buildConfigurationComboBox->setCurrentIndex(debug? 0 : 1);
@@ -555,7 +555,7 @@ void QMakeStepConfigWidget::buildConfigurationSelected()
{
if (m_ignoreChange)
return;
Qt4BuildConfiguration *bc = m_step->qt4BuildConfiguration();
QmakeBuildConfiguration *bc = m_step->qmakeBuildConfiguration();
QtSupport::BaseQtVersion::QmakeBuildConfigs buildConfiguration = bc->qmakeBuildConfiguration();
if (m_ui->buildConfigurationComboBox->currentIndex() == 0) { // debug
buildConfiguration = buildConfiguration | QtSupport::BaseQtVersion::DebugBuild;
@@ -639,7 +639,7 @@ void QMakeStepConfigWidget::updateEffectiveQMakeCall()
void QMakeStepConfigWidget::recompileMessageBoxFinished(int button)
{
if (button == QMessageBox::Yes) {
Qt4BuildConfiguration *bc = m_step->qt4BuildConfiguration();
QmakeBuildConfiguration *bc = m_step->qmakeBuildConfiguration();
if (!bc)
return;
@@ -677,7 +677,7 @@ bool QMakeStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const
{
if (parent->id() != ProjectExplorer::Constants::BUILDSTEPS_BUILD)
return false;
if (!qobject_cast<Qt4BuildConfiguration *>(parent->parent()))
if (!qobject_cast<QmakeBuildConfiguration *>(parent->parent()))
return false;
return id == QMAKE_BS_ID;
}
@@ -720,7 +720,7 @@ ProjectExplorer::BuildStep *QMakeStepFactory::restore(BuildStepList *parent, con
QList<Core::Id> QMakeStepFactory::availableCreationIds(ProjectExplorer::BuildStepList *parent) const
{
if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_BUILD)
if (Qt4BuildConfiguration *bc = qobject_cast<Qt4BuildConfiguration *>(parent->parent()))
if (QmakeBuildConfiguration *bc = qobject_cast<QmakeBuildConfiguration *>(parent->parent()))
if (!bc->qmakeStep())
return QList<Core::Id>() << Core::Id(QMAKE_BS_ID);
return QList<Core::Id>();
src/plugins/qt4projectmanager/qmakestep.h
+2 -2
View File
@@ -44,7 +44,7 @@ class Project;
}
namespace QmakeProjectManager {
class Qt4BuildConfiguration;
class QmakeBuildConfiguration;
class Qt4Project;
namespace Internal {
@@ -86,7 +86,7 @@ public:
explicit QMakeStep(ProjectExplorer::BuildStepList *parent);
virtual ~QMakeStep();
Qt4BuildConfiguration *qt4BuildConfiguration() const;
QmakeBuildConfiguration *qmakeBuildConfiguration() const;
virtual bool init();
virtual void run(QFutureInterface<bool> &);
virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();