diff options
author | hjk <hjk@qt.io> | 2019-08-06 16:50:30 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-08-07 10:35:41 +0000 |
commit | 07a918c89a0993f4c9568920d1155ff6c831fbf7 (patch) | |
tree | fb72827341f9de72c3b1e12c3533de48ff393502 /src/plugins/cmakeprojectmanager/cmakebuildstep.h | |
parent | 2521023627066ba6dd6f6446f2ad6a6f144efc01 (diff) |
Unification of desktop run configurations, step 1
First step, move {DesktopQt,Qbs,CMake}RunConfiguration{,Factory}
into the same new files.
This only moves down to QtSupport, not ProjectExplorer, as there
are in all three cases direct dependencies on QtSupport. Long term
I would expect them to move further down.
Change-Id: Ib16b19df7f3f642ed7f7db89a1f6904601d976ba
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakebuildstep.h')
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildstep.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.h b/src/plugins/cmakeprojectmanager/cmakebuildstep.h index 51f621abc7..5f2b9336b2 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.h +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.h @@ -40,13 +40,15 @@ class CommandLine; class PathChooser; } // Utils -namespace ProjectExplorer { class ToolChain; } +namespace ProjectExplorer { +class RunConfiguration; +class ToolChain; +} // ProjectManager namespace CMakeProjectManager { namespace Internal { class CMakeBuildConfiguration; -class CMakeRunConfiguration; class CMakeBuildStepFactory; class CMakeBuildStep : public ProjectExplorer::AbstractProcessStep @@ -67,7 +69,7 @@ public: QString toolArguments() const; void setToolArguments(const QString &list); - Utils::CommandLine cmakeCommand(CMakeRunConfiguration *rc) const; + Utils::CommandLine cmakeCommand(ProjectExplorer::RunConfiguration *rc) const; QVariantMap toMap() const override; @@ -104,7 +106,6 @@ private: void handleProjectWasParsed(bool success); void handleBuildTargetChanges(bool success); - CMakeRunConfiguration *targetsActiveRunConfiguration() const; QMetaObject::Connection m_runTrigger; |