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

CMakeProjectManager: Use aspect more directly in CMakeInstallStep

Browse Source 
Change-Id: Ibdd1fea42b93282b387693ea3d8cb155deeaed8a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-07-12 17:14:56 +02:00
parent d69302ad61
commit 69008e390c
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/cmakeprojectmanager/cmakeinstallstep.cpp
View File

@@ -16,6 +16,7 @@
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <utils/layoutbuilder.h> #include <utils/layoutbuilder.h>
using namespace Core; using namespace Core;
@@ -24,14 +25,20 @@ using namespace Utils;
namespace CMakeProjectManager::Internal { namespace CMakeProjectManager::Internal {
const char CMAKE_ARGUMENTS_KEY[] = "CMakeProjectManager.InstallStep.CMakeArguments";
// CMakeInstallStep // CMakeInstallStep
class CMakeInstallStep : public CMakeAbstractProcessStep class CMakeInstallStep : public CMakeAbstractProcessStep
{ {
public: public:
CMakeInstallStep(ProjectExplorer::BuildStepList *bsl, Id id); CMakeInstallStep(BuildStepList *bsl, Id id)
: CMakeAbstractProcessStep(bsl, id)
{
cmakeArguments.setSettingsKey("CMakeProjectManager.InstallStep.CMakeArguments");
cmakeArguments.setLabelText(Tr::tr("CMake arguments:"));
cmakeArguments.setDisplayStyle(StringAspect::LineEditDisplay);
setCommandLineProvider([this] { return cmakeCommand(); });
}
private: private:
CommandLine cmakeCommand() const; CommandLine cmakeCommand() const;
@@ -41,20 +48,9 @@ private:
void setupOutputFormatter(OutputFormatter *formatter) override; void setupOutputFormatter(OutputFormatter *formatter) override;
QWidget *createConfigWidget() override; QWidget *createConfigWidget() override;
StringAspect *m_cmakeArguments = nullptr; StringAspect cmakeArguments{this};
}; };
CMakeInstallStep::CMakeInstallStep(BuildStepList *bsl, Id id)
: CMakeAbstractProcessStep(bsl, id)
{
m_cmakeArguments = addAspect<StringAspect>();
m_cmakeArguments->setSettingsKey(CMAKE_ARGUMENTS_KEY);
m_cmakeArguments->setLabelText(Tr::tr("CMake arguments:"));
m_cmakeArguments->setDisplayStyle(StringAspect::LineEditDisplay);
setCommandLineProvider([this] { return cmakeCommand(); });
}
void CMakeInstallStep::setupOutputFormatter(OutputFormatter *formatter) void CMakeInstallStep::setupOutputFormatter(OutputFormatter *formatter)
{ {
CMakeParser *cmakeParser = new CMakeParser; CMakeParser *cmakeParser = new CMakeParser;
@@ -82,8 +78,7 @@ CommandLine CMakeInstallStep::cmakeCommand() const
cmd.addArg(bs->cmakeBuildType()); cmd.addArg(bs->cmakeBuildType());
} }
if (!m_cmakeArguments->value().isEmpty()) cmd.addArgs(cmakeArguments(), CommandLine::Raw);
cmd.addArgs(m_cmakeArguments->value(), CommandLine::Raw);
return cmd; return cmd;
} }
@@ -107,11 +102,11 @@ QWidget *CMakeInstallStep::createConfigWidget()
setDisplayName(Tr::tr("Install", "ConfigWidget display name.")); setDisplayName(Tr::tr("Install", "ConfigWidget display name."));
using namespace Layouting; using namespace Layouting;
auto widget = Form { m_cmakeArguments, noMargin }.emerge(); auto widget = Form { cmakeArguments, noMargin }.emerge();
updateDetails(); updateDetails();
connect(m_cmakeArguments, &StringAspect::changed, this, updateDetails); connect(&cmakeArguments, &StringAspect::changed, this, updateDetails);
connect(ProjectExplorerPlugin::instance(), connect(ProjectExplorerPlugin::instance(),
&ProjectExplorerPlugin::settingsChanged, &ProjectExplorerPlugin::settingsChanged,