diff --git a/src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp b/src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp index 9e84ae056cf63e709b54d39d9289693aa77ce7d4..5047c3b7b64ff77af34213136ccf2b9702fc3c1b 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 2d214e82512004e6cab138d321fe6ab32de38147..af77acafe8ec41f2853b32a2745cb2f138d27ba7 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;