summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativecustomparser.cpp
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2010-06-25 17:35:55 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2010-06-25 17:35:55 (GMT)
commit8576e0f3652a8de05a5e59488b2611833944e6d6 (patch)
tree31e2b9774dd5b8955094e3085b8e5f8a67a73526 /src/declarative/qml/qdeclarativecustomparser.cpp
parentaaa7dd6200ce272ea1e3dd78148844200ac698a7 (diff)
parent842ccf428d4cbed3c4ce1e0c894fbebcfd59ce0e (diff)
downloadQt-8576e0f3652a8de05a5e59488b2611833944e6d6.zip
Qt-8576e0f3652a8de05a5e59488b2611833944e6d6.tar.gz
Qt-8576e0f3652a8de05a5e59488b2611833944e6d6.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativecustomparser.cpp')
-rw-r--r--src/declarative/qml/qdeclarativecustomparser.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativecustomparser.cpp b/src/declarative/qml/qdeclarativecustomparser.cpp
index 472a883..97a6a00 100644
--- a/src/declarative/qml/qdeclarativecustomparser.cpp
+++ b/src/declarative/qml/qdeclarativecustomparser.cpp
@@ -295,4 +295,14 @@ int QDeclarativeCustomParser::evaluateEnum(const QByteArray& script) const
return compiler->evaluateEnum(script);
}
+/*!
+ Resolves \a name to a type, or 0 if it is not a type. This can be used
+ to type-check object nodes.
+*/
+const QMetaObject *QDeclarativeCustomParser::resolveType(const QByteArray& name) const
+{
+ return compiler->resolveType(name);
+}
+
+
QT_END_NAMESPACE