diff options
author | Martin Jones <martin.jones@nokia.com> | 2009-08-12 01:33:05 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2009-08-12 01:33:05 (GMT) |
commit | 10408036279e8102c3dd2870a6c71280c43da614 (patch) | |
tree | 57d307a842a8d2527d18e0c212295199a04ff771 /src/declarative/qml/qmlengine_p.h | |
parent | 6fc7ce61ba1b623421ca3ca8ee2315746be0a37b (diff) | |
parent | eae40ec9e65326bf268979afe1399d1fb8548105 (diff) | |
download | Qt-10408036279e8102c3dd2870a6c71280c43da614.zip Qt-10408036279e8102c3dd2870a6c71280c43da614.tar.gz Qt-10408036279e8102c3dd2870a6c71280c43da614.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlengine_p.h')
-rw-r--r-- | src/declarative/qml/qmlengine_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h index 602321d..d2e3ef4 100644 --- a/src/declarative/qml/qmlengine_p.h +++ b/src/declarative/qml/qmlengine_p.h @@ -86,6 +86,7 @@ class QmlValueTypeScriptClass; class QScriptEngineDebugger; class QNetworkReply; class QNetworkAccessManager; +class QmlAbstractBinding; class QmlEnginePrivate : public QObjectPrivate { @@ -160,10 +161,10 @@ public: } }; - static void clear(SimpleList<QmlBinding> &); + static void clear(SimpleList<QmlAbstractBinding> &); static void clear(SimpleList<QmlParserStatus> &); - QList<SimpleList<QmlBinding> > bindValues; + QList<SimpleList<QmlAbstractBinding> > bindValues; QList<SimpleList<QmlParserStatus> > parserStatus; QmlComponent *rootComponent; |