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

ProjectExplorer: Make it easier to use RunConfiguration ids

Browse Source 
... in RunWorkerFactory. The semantics is the same as in the other
{RunConfiguration,BuildConfiguration,...}Factory::addSupportedFoo
cases: As long as none is specified, there's no constraint, if
there are any, it's a whitelist.

Change-Id: Ia05afd9afe6886e4bacc58ac786f2548f03e5ca8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-04-04 08:26:44 +02:00
parent 118f713eb4
commit c3d0d2d97b
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/projectexplorer/runcontrol.cpp
View File

@@ -87,6 +87,11 @@ bool RunWorkerFactory::canRun(RunConfiguration *runConfiguration, Core::Id runMo
if (!m_supportedRunModes.contains(runMode)) if (!m_supportedRunModes.contains(runMode))
return false; return false;
if (!m_supportedRunConfigurations.isEmpty()) {
if (!m_supportedRunConfigurations.contains(runConfiguration->id()))
return false;
}
for (const Constraint &constraint : m_constraints) { for (const Constraint &constraint : m_constraints) {
if (!constraint(runConfiguration)) if (!constraint(runConfiguration))
return false; return false;
@@ -115,6 +120,16 @@ void RunWorkerFactory::addSupportedRunMode(Core::Id runMode)
m_supportedRunModes.append(runMode); m_supportedRunModes.append(runMode);
} }
void RunWorkerFactory::setSupportedRunConfigurations(const QList<Core::Id> &ids)
{
m_supportedRunConfigurations = ids;
}
void RunWorkerFactory::addSupportedRunConfiguration(Core::Id id)
{
m_supportedRunConfigurations.append(id);
}
void RunWorkerFactory::destroyRemainingRunWorkerFactories() void RunWorkerFactory::destroyRemainingRunWorkerFactories()
{ {
qDeleteAll(g_runWorkerFactories); qDeleteAll(g_runWorkerFactories);

4
src/plugins/projectexplorer/runcontrol.h
View File

@@ -157,6 +157,9 @@ public:
void addConstraint(const Constraint &constraint); void addConstraint(const Constraint &constraint);
void addSupportedRunMode(Core::Id runMode); void addSupportedRunMode(Core::Id runMode);
void setSupportedRunConfigurations(const QList<Core::Id> &ids);
void addSupportedRunConfiguration(Core::Id id);
WorkerCreator producer() const { return m_producer; } WorkerCreator producer() const { return m_producer; }
private: private:
@@ -166,6 +169,7 @@ private:
static void destroyRemainingRunWorkerFactories(); static void destroyRemainingRunWorkerFactories();
QList<Core::Id> m_supportedRunModes; QList<Core::Id> m_supportedRunModes;
QList<Core::Id> m_supportedRunConfigurations;
QList<Constraint> m_constraints; QList<Constraint> m_constraints;
WorkerCreator m_producer; WorkerCreator m_producer;
}; };