forked from qt-creator/qt-creator
Utils: Introduce variantFromStore and storeFromVariant
These are functional replacements for QVariant::fromValue(QVariantMap) (or QVariant::fromValue(Store)) and QVariant::toMap() (or QVariant::toValue<Store>()) We will have a few code paths in the end that need to explicitly operarate on both QVariantMap and Store (e.g. actual reading/writing to keep format compatibility etc), so these can't in the end be simple to/fromValue(OneType) but need an internal 'if' or such. Change-Id: I954f3cb24fa8fe123162b72bbd25d891dd19b768 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
@@ -187,7 +187,7 @@ static bool restoreQtVersions()
|
||||
if (!ok || count < 0)
|
||||
continue;
|
||||
|
||||
const Store qtversionMap = it.value().value<Store>();
|
||||
const Store qtversionMap = storeFromVariant(it.value());
|
||||
const QString type = qtversionMap.value(QTVERSION_TYPE_KEY).toString();
|
||||
|
||||
bool restored = false;
|
||||
@@ -261,7 +261,7 @@ void QtVersionManager::updateFromInstaller(bool emitSignal)
|
||||
if (!ok || count < 0)
|
||||
continue;
|
||||
|
||||
Store qtversionMap = it.value().value<Store>();
|
||||
Store qtversionMap = storeFromVariant(it.value());
|
||||
const QString type = qtversionMap.value(QTVERSION_TYPE_KEY).toString();
|
||||
const QString autoDetectionSource = qtversionMap.value("autodetectionSource").toString();
|
||||
sdkVersions << autoDetectionSource;
|
||||
|
||||
Reference in New Issue
Block a user