diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-09 05:19:09 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-09 05:19:09 (GMT) |
| commit | 475abec27948923ae6de74db53b137f19c661601 (patch) | |
| tree | 35f572bd7d17390e35164d2b8882c67bb22ff82e /src | |
| parent | 95ad31adca64f639712fa378d25aa3e552b3dc72 (diff) | |
| parent | ce69639de67ae74caedb545c9c94aaae6512243f (diff) | |
| download | Qt-475abec27948923ae6de74db53b137f19c661601.zip Qt-475abec27948923ae6de74db53b137f19c661601.tar.gz Qt-475abec27948923ae6de74db53b137f19c661601.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarativescriptparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativescriptparser.cpp b/src/declarative/qml/qdeclarativescriptparser.cpp index 92a10aa..ac49332 100644 --- a/src/declarative/qml/qdeclarativescriptparser.cpp +++ b/src/declarative/qml/qdeclarativescriptparser.cpp @@ -647,7 +647,7 @@ bool ProcessAST::visit(AST::UiPublicMember *node) property.location = location(node->firstSourceLocation(), node->lastSourceLocation()); - if (memberType == QByteArray("var")) + 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."; |