diff options
Diffstat (limited to 'src/plugins/projectexplorer')
-rw-r--r-- | src/plugins/projectexplorer/projectexplorer.cpp | 10 | ||||
-rw-r--r-- | src/plugins/projectexplorer/runconfiguration.cpp | 13 | ||||
-rw-r--r-- | src/plugins/projectexplorer/runconfiguration.h | 4 |
3 files changed, 26 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 61c3bf50a7..e6c25c84b6 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -1980,10 +1980,18 @@ void ProjectExplorerPluginPrivate::buildStateChanged(Project * pro) // NBS TODO implement more than one runner static IRunControlFactory *findRunControlFactory(RunConfiguration *config, Core::Id mode) { - return ExtensionSystem::PluginManager::getObject<IRunControlFactory>( + auto factories = ExtensionSystem::PluginManager::getObjects<IRunControlFactory>( [&config, &mode](IRunControlFactory *factory) { return factory->canRun(config, mode); }); + + if (factories.isEmpty()) + return nullptr; + auto it = std::max_element(factories.begin(), factories.end(), + [](IRunControlFactory *a, IRunControlFactory *b) { + return a->priority() < b->priority(); + }); + return *it; } void ProjectExplorerPluginPrivate::executeRunConfiguration(RunConfiguration *runConfiguration, Core::Id runMode) diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index da5c7b398b..e06bbda79d 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -501,6 +501,19 @@ IRunConfigurationAspect *IRunControlFactory::createRunConfigurationAspect(RunCon than it needs to be. */ + +const char PRIORITY_KEY[] = "RunControlFactoryPriority"; + +int ProjectExplorer::IRunControlFactory::priority() const +{ + return property(PRIORITY_KEY).toInt(); // 0 by default. +} + +void IRunControlFactory::setPriority(int priority) +{ + setProperty(PRIORITY_KEY, priority); +} + namespace Internal { class RunControlPrivate diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index 3efb2dae5b..9a330afb9f 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -335,6 +335,10 @@ public: virtual RunControl *create(RunConfiguration *runConfiguration, Core::Id mode, QString *errorMessage) = 0; virtual IRunConfigurationAspect *createRunConfigurationAspect(RunConfiguration *rc); + + int priority() const; +protected: + void setPriority(int priority); // Higher values will be preferred. }; class PROJECTEXPLORER_EXPORT RunConfigWidget : public QWidget |