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

Merge remote-tracking branch 'origin/4.3' into 4.4

Browse Source 
Conflicts:
	src/plugins/projectexplorer/projectexplorer.cpp

This temporarily breaks handling of IRunControlFactory priorities.

Change-Id: Ibbc3c296ac82179f8e627a77436db2ac8fd505a2
This commit is contained in:
Eike Ziller
2017-06-30 13:50:45 +02:00
parent f55d3c5c6f e974f0733e
commit 5a848aa188
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -538,6 +538,19 @@ IRunConfigurationAspect *IRunControlFactory::createRunConfigurationAspect(RunCon
than it needs to be. 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 { namespace Internal {
enum class RunWorkerState enum class RunWorkerState

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

@@ -341,6 +341,10 @@ public:
virtual RunControl *create(RunConfiguration *runConfiguration, Core::Id runMode, QString *errorMessage); virtual RunControl *create(RunConfiguration *runConfiguration, Core::Id runMode, QString *errorMessage);
virtual IRunConfigurationAspect *createRunConfigurationAspect(RunConfiguration *rc); virtual IRunConfigurationAspect *createRunConfigurationAspect(RunConfiguration *rc);
int priority() const;
protected:
void setPriority(int priority); // Higher values will be preferred.
}; };
class PROJECTEXPLORER_EXPORT RunConfigWidget : public QWidget class PROJECTEXPLORER_EXPORT RunConfigWidget : public QWidget