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

CMake: Use StringAspect for cmake arguments

Browse Source 
Change-Id: I18e9af5f630a2b0a11a427848368c9f980819717
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-09-08 14:53:15 +02:00
parent 61bfd32438
commit 4964d0bf81
2 changed files with 32 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/cmakeprojectmanager/cmakebuildstep.h
View File

@@ -31,7 +31,10 @@
namespace Utils { class CommandLine; }
namespace ProjectExplorer { class RunConfiguration; }
namespace ProjectExplorer {
class RunConfiguration;
class StringAspect;
} // ProjectExplorer
namespace CMakeProjectManager {
namespace Internal {
@@ -53,11 +56,6 @@ public:
bool buildsBuildTarget(const QString &target) const;
void setBuildTargets(const QStringList &target);
QString cmakeArguments() const;
void setCMakeArguments(const QString &list);
QString toolArguments() const;
void setToolArguments(const QString &list);
Utils::CommandLine cmakeCommand(ProjectExplorer::RunConfiguration *rc) const;
QStringList knownBuildTargets();
@@ -96,9 +94,10 @@ private:
QMetaObject::Connection m_runTrigger;
friend class CMakeBuildStepConfigWidget;
QStringList m_buildTargets;
QString m_cmakeArguments;
QString m_toolArguments;
ProjectExplorer::StringAspect *m_cmakeArguments = nullptr;
ProjectExplorer::StringAspect *m_toolArguments = nullptr;
bool m_waiting = false;
};