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

Amend "ProjectExplorer: Introduce and use a new MultiSelectionAspect"

Browse Source 
This partially reverts commit 34798b3efd,
which breaks binary compatibility.

Change-Id: I17d55760fac599bfba1f5a9726d81898e6979926
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2021-01-06 08:49:48 +01:00
parent 9f7af33404
commit a2d1ff94b4
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/projectexplorer/makestep.cpp
View File

@@ -417,6 +417,22 @@ QWidget *MakeStep::createConfigWidget()
return widget;
}
bool MakeStep::buildsTarget(const QString &target) const
{
return m_buildTargetsAspect->value().contains(target);
}
void MakeStep::setBuildTarget(const QString &target, bool on)
{
QStringList old = m_buildTargetsAspect->value();
if (on && !old.contains(target))
old << target;
else if (!on && old.contains(target))
old.removeOne(target);
m_buildTargetsAspect->setValue(old);
}
QStringList MakeStep::availableTargets() const
{
return m_buildTargetsAspect->allValues();

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

@@ -78,6 +78,11 @@ public:
Utils::Environment makeEnvironment() const;
// FIXME: All unused, remove in 4.15.
void setBuildTarget(const QString &buildTarget) { setSelectedBuildTarget(buildTarget); }
bool buildsTarget(const QString &target) const;
void setBuildTarget(const QString &target, bool on);
protected:
void supportDisablingForSubdirs() { m_disablingForSubDirsSupported = true; }
virtual QStringList displayArguments() const;
@@ -87,6 +92,7 @@ private:
QStringList jobArguments() const;
Utils::MultiSelectionAspect *m_buildTargetsAspect = nullptr;
QStringList m_availableTargets; // FIXME: Unused, remove in 4.15.
Utils::StringAspect *m_makeCommandAspect = nullptr;
Utils::StringAspect *m_userArgumentsAspect = nullptr;
Utils::AspectContainer *m_jobCountContainer = nullptr;