summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-04-19 07:13:50 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-04-19 07:14:25 (GMT)
commit906a4c123794efd02b64b03fc544925ce3f4a012 (patch)
treed6b58531f980a9f84fd0f911fe20d86266d8beb8 /src
parent9b4df240c1007040f4be7bccb952fb422eaf34f5 (diff)
downloadQt-906a4c123794efd02b64b03fc544925ce3f4a012.zip
Qt-906a4c123794efd02b64b03fc544925ce3f4a012.tar.gz
Qt-906a4c123794efd02b64b03fc544925ce3f4a012.tar.bz2
Remove "property var" support
Diffstat (limited to 'src')
-rw-r--r--src/declarative/qml/qdeclarativescriptparser.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/declarative/qml/qdeclarativescriptparser.cpp b/src/declarative/qml/qdeclarativescriptparser.cpp
index 674df9d..e7c8a12 100644
--- a/src/declarative/qml/qdeclarativescriptparser.cpp
+++ b/src/declarative/qml/qdeclarativescriptparser.cpp
@@ -516,7 +516,6 @@ bool ProcessAST::visit(AST::UiPublicMember *node)
// { "time", Object::DynamicProperty::Time, "QTime" },
// { "date", Object::DynamicProperty::Date, "QDate" },
{ "date", Object::DynamicProperty::DateTime, "QDateTime" },
- { "var", Object::DynamicProperty::Variant, "QVariant" },
{ "variant", Object::DynamicProperty::Variant, "QVariant" }
};
const int propTypeNameToTypesCount = sizeof(propTypeNameToTypes) /
@@ -628,11 +627,6 @@ bool ProcessAST::visit(AST::UiPublicMember *node)
property.location = location(node->firstSourceLocation(),
node->lastSourceLocation());
- if (memberType == QLatin1String("var"))
- qWarning().nospace() << qPrintable(_parser->_scriptFile) << ":" << property.location.start.line << ":"
- << property.location.start.column << ": var type has been replaced by variant. "
- << "Support will be removed entirely shortly.";
-
if (node->expression) { // default value
property.defaultValue = new Property;
property.defaultValue->parent = _stateStack.top().object;