diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-23 12:29:56 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-23 12:29:56 (GMT) |
commit | b0bc605e2ede4466aabf5b5da040e5801dbf9156 (patch) | |
tree | 4db2a40ca239bbde9df52580064a9a6c2db921e6 /src/declarative/qml/qmlvme_p.h | |
parent | 3baf0c6d7d8098c6226c0ffade2b6740b0bc96cc (diff) | |
download | Qt-b0bc605e2ede4466aabf5b5da040e5801dbf9156.zip Qt-b0bc605e2ede4466aabf5b5da040e5801dbf9156.tar.gz Qt-b0bc605e2ede4466aabf5b5da040e5801dbf9156.tar.bz2 |
Make more qmlecmascript tests pass
Test cases constantsOverrideBindings, outerBindingOverridesInnerBinding and
aliasPropertyAndBinding now pass.
Diffstat (limited to 'src/declarative/qml/qmlvme_p.h')
-rw-r--r-- | src/declarative/qml/qmlvme_p.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlvme_p.h b/src/declarative/qml/qmlvme_p.h index 30a6e4f..38ba06f 100644 --- a/src/declarative/qml/qmlvme_p.h +++ b/src/declarative/qml/qmlvme_p.h @@ -56,6 +56,7 @@ #include <QtCore/QString> #include <QtCore/QStack> #include <QtDeclarative/qmlerror.h> +#include <private/qbitfield_p.h> QT_BEGIN_NAMESPACE @@ -70,14 +71,17 @@ class QmlVME public: QmlVME(); - QObject *run(QmlContext *, QmlCompiledData *, int start = -1, int count = -1); + QObject *run(QmlContext *, QmlCompiledData *, + int start = -1, int count = -1, + const QBitField & = QBitField()); void runDeferred(QObject *); bool isError() const; QList<QmlError> errors() const; private: - QObject *run(QStack<QObject *> &, QmlContext *, QmlCompiledData *, int start, int count); + QObject *run(QStack<QObject *> &, QmlContext *, QmlCompiledData *, + int start, int count, const QBitField &); QList<QmlError> vmeErrors; }; |