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

Qbs: Do not list Qbs steps in non-Qbs projects

Browse Source 
They can not work there anyway.

Change-Id: Ic643ae7e35ad599ffb3928530eafb6ec537f3f04
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2013-05-31 14:33:24 +02:00
parent ba2d0fc929
commit 7cf9312a4c
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -422,7 +422,8 @@ QbsBuildStepFactory::QbsBuildStepFactory(QObject *parent) :
QList<Core::Id> QbsBuildStepFactory::availableCreationIds(ProjectExplorer::BuildStepList *parent) const QList<Core::Id> QbsBuildStepFactory::availableCreationIds(ProjectExplorer::BuildStepList *parent) const
{ {
if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_BUILD if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_BUILD
&& qobject_cast<QbsBuildConfiguration *>(parent->parent())) && qobject_cast<QbsBuildConfiguration *>(parent->parent())
&& qobject_cast<QbsProject *>(parent->target()->project()))
return QList<Core::Id>() << Core::Id(Constants::QBS_BUILDSTEP_ID); return QList<Core::Id>() << Core::Id(Constants::QBS_BUILDSTEP_ID);
return QList<Core::Id>(); return QList<Core::Id>();
} }
@@ -437,7 +438,8 @@ QString QbsBuildStepFactory::displayNameForId(const Core::Id id) const
bool QbsBuildStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const bool QbsBuildStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const
{ {
if (parent->id() != Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD) if (parent->id() != Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD)
|| !qobject_cast<QbsBuildConfiguration *>(parent->parent())) || !qobject_cast<QbsBuildConfiguration *>(parent->parent())
|| !qobject_cast<QbsProject *>(parent->target()->project()))
return false; return false;
return id == Core::Id(Constants::QBS_BUILDSTEP_ID); return id == Core::Id(Constants::QBS_BUILDSTEP_ID);
} }

6
src/plugins/qbsprojectmanager/qbsinstallstep.cpp
View File

@@ -363,7 +363,8 @@ QbsInstallStepFactory::QbsInstallStepFactory(QObject *parent) :
QList<Core::Id> QbsInstallStepFactory::availableCreationIds(ProjectExplorer::BuildStepList *parent) const QList<Core::Id> QbsInstallStepFactory::availableCreationIds(ProjectExplorer::BuildStepList *parent) const
{ {
if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_DEPLOY if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_DEPLOY
&& qobject_cast<ProjectExplorer::DeployConfiguration *>(parent->parent())) && qobject_cast<ProjectExplorer::DeployConfiguration *>(parent->parent())
&& qobject_cast<QbsProject *>(parent->target()->project()))
return QList<Core::Id>() << Core::Id(Constants::QBS_INSTALLSTEP_ID); return QList<Core::Id>() << Core::Id(Constants::QBS_INSTALLSTEP_ID);
return QList<Core::Id>(); return QList<Core::Id>();
} }
@@ -378,7 +379,8 @@ QString QbsInstallStepFactory::displayNameForId(const Core::Id id) const
bool QbsInstallStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const bool QbsInstallStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const
{ {
if (parent->id() != Core::Id(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY) if (parent->id() != Core::Id(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
|| !qobject_cast<ProjectExplorer::DeployConfiguration *>(parent->parent())) || !qobject_cast<ProjectExplorer::DeployConfiguration *>(parent->parent())
|| !qobject_cast<QbsProject *>(parent->target()->project()))
return false; return false;
return id == Core::Id(Constants::QBS_INSTALLSTEP_ID); return id == Core::Id(Constants::QBS_INSTALLSTEP_ID);
} }