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

Revert "QmlDesigner: Remove 'variant' as qml type"

Browse Source 
Actually it's 'variant' now, not 'var' any more

Reviewed-by: Thomas Hartmann
This commit is contained in:
Kai Koehne
2010-04-13 11:21:49 +02:00
parent 5650dbc55d
commit 300f90f161
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp
View File

@@ -420,12 +420,14 @@ 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") {
} else if (type() == "var" || type() == "variant") {
return variant;
} else if (type() == "alias") {
// TODO: The QML compiler resolves the alias type. We probably should do the same.

2
src/plugins/qmldesigner/core/model/texttomodelmerger.cpp
View File

@@ -148,7 +148,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"))
else if (typeName == QLatin1String("var") || typeName == QLatin1String("variant"))
return QMetaType::type("QVariant");
else
return -1;