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

DefaultAnnotationsModel: handle default case as string

Browse Source 
Change-Id: I8a631f89f849b05c52e559b83ec63104156454df
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Michael Winkelmann
2021-04-07 11:38:31 +02:00
parent 77d8a88a3e
commit f4df672935
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmldesigner/components/annotationeditor/defaultannotations.cpp
View File

@@ -139,9 +139,6 @@ QVariantMap DefaultAnnotationsModel::asVariantMapFromJson(const QJsonDocument &d
case QJsonValue::Double: case QJsonValue::Double:
map[key] = double{0.0}; map[key] = double{0.0};
break; break;
case QJsonValue::String:
map[key] = QString{};
break;
case QJsonValue::Bool: case QJsonValue::Bool:
map[key] = false; map[key] = false;
break; break;
@@ -161,6 +158,10 @@ QVariantMap DefaultAnnotationsModel::asVariantMapFromJson(const QJsonDocument &d
else if (type == QStringLiteral("color")) else if (type == QStringLiteral("color"))
map[key] = QVariant::fromValue(QColor(val.toString())); map[key] = QVariant::fromValue(QColor(val.toString()));
} }
default:
case QJsonValue::String:
map[key] = QString{};
break;
} }
} }