summaryrefslogtreecommitdiff
path: root/src/plugins/ios/iosrunfactories.cpp
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@digia.com>2014-06-12 16:24:52 +0200
committerDaniel Teske <daniel.teske@digia.com>2014-06-16 13:04:23 +0200
commitc78258cd57abac4a593965c1d759c0b877f9f1c7 (patch)
treea4f0af8c86c16fabdc1162664081254aa61193b7 /src/plugins/ios/iosrunfactories.cpp
parentd15e0aa9e71572325a19b24f3bd356cf8716ef2a (diff)
downloadqt-creator-c78258cd57abac4a593965c1d759c0b877f9f1c7.tar.gz
Allow the user to restrict rc creation to certain .pro
Task-number: QTCREATORBUG-10953 Change-Id: Iff1a31c007ac777bfa390d48237480ef56ffc0e4 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/ios/iosrunfactories.cpp')
-rw-r--r--src/plugins/ios/iosrunfactories.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/plugins/ios/iosrunfactories.cpp b/src/plugins/ios/iosrunfactories.cpp
index 259ebbe1b9..456ead3217 100644
--- a/src/plugins/ios/iosrunfactories.cpp
+++ b/src/plugins/ios/iosrunfactories.cpp
@@ -59,7 +59,11 @@ namespace Internal {
static QString pathFromId(const Core::Id id)
{
- return id.suffixAfter(IOS_RC_ID_PREFIX);
+ QString pathStr = id.toString();
+ const QString prefix = QLatin1String(IOS_RC_ID_PREFIX);
+ if (!pathStr.startsWith(prefix))
+ return QString();
+ return pathStr.mid(prefix.size());
}
IosRunConfigurationFactory::IosRunConfigurationFactory(QObject *parent)
@@ -88,19 +92,19 @@ bool IosRunConfigurationFactory::canClone(Target *parent, RunConfiguration *sour
return canCreate(parent, source->id());
}
-QList<Core::Id> IosRunConfigurationFactory::availableCreationIds(Target *parent) const
+QList<Core::Id> IosRunConfigurationFactory::availableCreationIds(Target *parent, CreationMode mode) const
{
- QList<Core::Id> ids;
if (!IosManager::supportsIos(parent))
- return ids;
- Core::Id baseId(IOS_RC_ID_PREFIX);
+ return QList<Core::Id>();
QmakeProject *project = static_cast<QmakeProject *>(parent->project());
QList<QmakeProFileNode *> nodes = project->allProFiles(QList<QmakeProjectType>()
<< ApplicationTemplate
<< LibraryTemplate
<< AuxTemplate);
-
+ if (mode == AutoCreate)
+ nodes = QmakeProject::nodesWithQtcRunnable(nodes);
+ Core::Id baseId(IOS_RC_ID_PREFIX);
return QmakeProject::idsForNodes(baseId, nodes);
}