From 107ad1cadfc22f056efec3ebf72337a5a89d2341 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Wed, 31 Mar 2010 14:40:19 +0200
Subject: [PATCH] QmlDesigner: Remove 'variant' as qml type
'variant' has been removed from the qml grammar: d1f019567, it's now 'var' only.
---
src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp | 4 +---
src/plugins/qmldesigner/core/model/texttomodelmerger.cpp | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp b/src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp
index 9e84ae056cf..5047c3b7b64 100644
--- a/src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp
+++ b/src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp
@@ -420,14 +420,12 @@ QVariant PropertyMetaInfo::castedValue(const QVariant &originalVariant) const
return variant;
} else if (typeId == QVariant::UserType && m_data->type == QLatin1String("QVariant")) {
return variant;
- } else if (typeId == QVariant::UserType && m_data->type == QLatin1String("variant")) {
- return variant;
} else if (typeId == QVariant::UserType && m_data->type == QLatin1String("var")) {
return variant;
} else if (variant.type() == QVariant::List && variant.type() == QVariant::List) {
// TODO: check the contents of the list
return variant;
- } else if (type() == "var" || type() == "variant") {
+ } else if (type() == "var") {
return variant;
} else if (type() == "alias") {
// TODO: The QML compiler resolves the alias type. We probably should do the same.
diff --git a/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp
index 2d214e82512..af77acafe8e 100644
--- a/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp
@@ -185,7 +185,7 @@ static inline int propertyType(const QString &typeName)
return QMetaType::type("QString");
else if (typeName == QLatin1String("url"))
return QMetaType::type("QUrl");
- else if (typeName == QLatin1String("var") || typeName == QLatin1String("variant"))
+ else if (typeName == QLatin1String("var"))
return QMetaType::type("QVariant");
else
return -1;
--
GitLab