summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativecompiler_p.h
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/qdeclarativecompiler_p.h
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/qdeclarativecompiler_p.h')
-rw-r--r--src/declarative/qml/qdeclarativecompiler_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h
index 908c703..caad376 100644
--- a/src/declarative/qml/qdeclarativecompiler_p.h
+++ b/src/declarative/qml/qdeclarativecompiler_p.h
@@ -161,6 +161,7 @@ public:
static bool isSignalPropertyName(const QByteArray &);
int evaluateEnum(const QByteArray& script) const; // for QDeclarativeCustomParser::evaluateEnum
+ const QMetaObject *resolveType(const QByteArray& name) const; // for QDeclarativeCustomParser::resolveType
private:
static void reset(QDeclarativeCompiledData *);