KitInformation: Improve robustness to nullptr passed as kit

All the KitInformation methods need to gracefully handle a kit that is
a nullptr. Ensure this is indeed the case.

This might fix the actual trigger for QTCREATORBUG-19469.

Change-Id: Id78ac8a26c1be908f41a425ff1935b86888e4b8b
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2018-02-12 12:49:22 +01:00
parent d5c449575e
commit 3874b6b6ec
7 changed files with 68 additions and 23 deletions

View File

@@ -30,6 +30,8 @@
#include <projectexplorer/kitconfigwidget.h>
#include <projectexplorer/kitmanager.h>
#include <utils/qtcassert.h>
#include <qbs.h>
#include <QLabel>
@@ -89,11 +91,13 @@ QString QbsKitInformation::representation(const Kit *kit)
QVariantMap QbsKitInformation::properties(const Kit *kit)
{
QTC_ASSERT(kit, return QVariantMap());
return kit->value(id()).toMap();
}
void QbsKitInformation::setProperties(Kit *kit, const QVariantMap &properties)
{
QTC_ASSERT(kit, return);
kit->setValue(id(), properties);
}