aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cmakeprojectmanager/cmakebuildstep.h
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-01-25 14:26:34 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2019-01-31 16:10:01 +0000
commit966f4ea6a9d1e46833fc30df878ba6fa8f919988 (patch)
tree7f37c2adcf4dd6fe002585fb3b3c2815b21c5f26 /src/plugins/cmakeprojectmanager/cmakebuildstep.h
parent536618b012b44b5ced428fc39600931803d5dd44 (diff)
ProjectExplorer: Rework the build step run interface
Originally, the build manager used to run all build steps in a dedicated thread. Communication between the step and the manager happened via a QFutureInterface that was passed into the step's run() function. Later, new steps were added that operated asynchronously, so the build manager had to differentiate between the different kinds of steps for starting and stopping. These days, almost all build and deploy steps work asynchronously, which made the QFuture-based interface look increasingly odd. With this patch, all build steps are expected to work asynchronously, so the build manager no longer needs to differentiate. Steps are started and requested to stop via the run() and cancel() functions, respectively, and emit the finished() signal when they are done. Build step implementors no longer have to deal with a QFutureInterface. For steps whose implementation is inherently synchronous, the BuildStep base class offers a runInThread() function. Change-Id: If905c68b234c5a669f6e19f43142eaa57d594803 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakebuildstep.h')
-rw-r--r--src/plugins/cmakeprojectmanager/cmakebuildstep.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.h b/src/plugins/cmakeprojectmanager/cmakebuildstep.h
index 91dab9b455..9e76889d28 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.h
@@ -56,11 +56,6 @@ public:
CMakeBuildConfiguration *cmakeBuildConfiguration() const;
- bool init() override;
- void run(QFutureInterface<bool> &fi) override;
-
- ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
-
QString buildTarget() const;
bool buildsBuildTarget(const QString &target) const;
void setBuildTarget(const QString &target);
@@ -98,8 +93,12 @@ protected:
private:
void ctor(ProjectExplorer::BuildStepList *bsl);
- void runImpl(QFutureInterface<bool> &fi);
- void handleProjectWasParsed(QFutureInterface<bool> &fi, bool success);
+ bool init() override;
+ void doRun() override;
+ ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
+
+ void runImpl();
+ void handleProjectWasParsed(bool success);
void handleBuildTargetChanges(bool success);
CMakeRunConfiguration *targetsActiveRunConfiguration() const;
@@ -112,6 +111,7 @@ private:
QString m_buildTarget;
QString m_toolArguments;
bool m_useNinja = false;
+ bool m_waiting = false;
};
class CMakeBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget