diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-03-12 16:50:39 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-03-15 14:47:18 +0000 |
| commit | d4565be6557fca844dcf4bf427e0ff9c0838df50 (patch) | |
| tree | ea002e07fe7f0ea29113b64ebabf03233e2813d5 /src/plugins/projectexplorer/kitinformation.cpp | |
| parent | e80d83cb20cfd57ce9bbb059f6f5b7cb6c86d416 (diff) | |
ProjectExplorer: Drop KitAspect::defaultValue()
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>
Diffstat (limited to 'src/plugins/projectexplorer/kitinformation.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/kitinformation.cpp | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp index 7879b034b8..1453a77390 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/src/plugins/projectexplorer/kitinformation.cpp @@ -122,12 +122,6 @@ SysRootKitAspect::SysRootKitAspect() setPriority(31000); } -QVariant SysRootKitAspect::defaultValue(const Kit *k) const -{ - Q_UNUSED(k) - return QString(); -} - QList<Task> SysRootKitAspect::validate(const Kit *k) const { QList<Task> result; @@ -375,12 +369,6 @@ static QVariant defaultToolChainValue() return result; } -QVariant ToolChainKitAspect::defaultValue(const Kit *k) const -{ - Q_UNUSED(k); - return defaultToolChainValue(); -} - QList<Task> ToolChainKitAspect::validate(const Kit *k) const { QList<Task> result; @@ -494,7 +482,9 @@ void ToolChainKitAspect::setup(Kit *k) QTC_ASSERT(ToolChainManager::isLoaded(), return); QTC_ASSERT(k, return); - const QVariantMap value = k->value(ToolChainKitAspect::id()).toMap(); + QVariantMap value = k->value(id()).toMap(); + if (value.empty()) + value = defaultToolChainValue().toMap(); for (auto i = value.constBegin(); i != value.constEnd(); ++i) { Core::Id l = findLanguage(i.key()); @@ -813,10 +803,10 @@ DeviceTypeKitAspect::DeviceTypeKitAspect() makeEssential(); } -QVariant DeviceTypeKitAspect::defaultValue(const Kit *k) const +void DeviceTypeKitAspect::setup(Kit *k) { - Q_UNUSED(k); - return QByteArray(Constants::DESKTOP_DEVICE_TYPE); + if (k) + k->setValue(id(), QByteArray(Constants::DESKTOP_DEVICE_TYPE)); } QList<Task> DeviceTypeKitAspect::validate(const Kit *k) const @@ -1244,12 +1234,6 @@ EnvironmentKitAspect::EnvironmentKitAspect() setPriority(29000); } -QVariant EnvironmentKitAspect::defaultValue(const Kit *k) const -{ - Q_UNUSED(k) - return QStringList(); -} - QList<Task> EnvironmentKitAspect::validate(const Kit *k) const { QList<Task> result; |