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

RemoteLinux: Fix "make install" step

Browse Source 
Was mangled in 42ab5c84b9.

Fixes: QTCREATORBUG-25359
Change-Id: I0a4f69fc72433548d44461c3c7c02bd53708d12d
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2021-05-07 13:47:50 +02:00
parent 8d44ae5d7e
commit ed1ed2aa24
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/projectexplorer/makestep.h
View File

@@ -87,6 +87,13 @@ protected:
void supportDisablingForSubdirs() { m_disablingForSubDirsSupported = true; } void supportDisablingForSubdirs() { m_disablingForSubDirsSupported = true; }
virtual QStringList displayArguments() const; virtual QStringList displayArguments() const;
Utils::StringAspect *makeCommandAspect() const { return m_makeCommandAspect; }
Utils::MultiSelectionAspect *buildTargetsAspect() const { return m_buildTargetsAspect; }
Utils::StringAspect *userArgumentsAspect() const { return m_userArgumentsAspect; }
Utils::AspectContainer *jobCountContainer() const { return m_jobCountContainer; }
Utils::BoolAspect *disabledForSubdirsAspect() const { return m_disabledForSubdirsAspect; }
private: private:
static int defaultJobCount(); static int defaultJobCount();
QStringList jobArguments() const; QStringList jobArguments() const;

6
src/plugins/remotelinux/makeinstallstep.cpp
View File

@@ -58,6 +58,12 @@ const char CustomCommandLineAspectId[] = "RemoteLinux.MakeInstall.CustomCommandL
MakeInstallStep::MakeInstallStep(BuildStepList *parent, Utils::Id id) : MakeStep(parent, id) MakeInstallStep::MakeInstallStep(BuildStepList *parent, Utils::Id id) : MakeStep(parent, id)
{ {
makeCommandAspect()->setVisible(false);
buildTargetsAspect()->setVisible(false);
userArgumentsAspect()->setVisible(false);
jobCountContainer()->setVisible(false);
disabledForSubdirsAspect()->setVisible(false);
const auto makeAspect = addAspect<ExecutableAspect>(); const auto makeAspect = addAspect<ExecutableAspect>();
makeAspect->setId(MakeAspectId); makeAspect->setId(MakeAspectId);
makeAspect->setSettingsKey(MakeAspectId); makeAspect->setSettingsKey(MakeAspectId);