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

ProjectExplorer: Drop KitAspect::defaultValue()

Browse Source 
The functionality of this function overlapped with KitAspect::setup(),
leading to unclear responsibilities and resulting in bugs such as the
one fixed by 776d54e435.
Therefore, we drop the defaultValue() function, merging its
implementation with setup() where applicable.

Change-Id: Iefa9c3df8b76e97ddf9ad388516621f7ea6558d4
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-03-12 16:50:39 +01:00
parent e80d83cb20
commit d4565be655
17 changed files with 29 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidgdbserverkitinformation.cpp
View File

@@ -80,9 +80,9 @@ AndroidGdbServerKitAspect::AndroidGdbServerKitAspect()
setPriority(27999); // Just one less than Debugger!
}
QVariant AndroidGdbServerKitAspect::defaultValue(const Kit *kit) const
void AndroidGdbServerKitAspect::setup(Kit *kit)
{
return autoDetect(kit).toString();
kit->setValue(id(), autoDetect(kit).toString());
}
QList<Task> AndroidGdbServerKitAspect::validate(const Kit *) const

2
src/plugins/android/androidgdbserverkitinformation.h
View File

@@ -36,7 +36,7 @@ class AndroidGdbServerKitAspect : public ProjectExplorer::KitAspect
public:
AndroidGdbServerKitAspect();
QVariant defaultValue(const ProjectExplorer::Kit *) const override;
void setup(ProjectExplorer::Kit *) override;
QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *) const override;
bool isApplicableToKit(const ProjectExplorer::Kit *k) const override;
ItemList toUserOutput(const ProjectExplorer::Kit *) const override;