diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-10-28 08:26:20 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-10-28 08:26:20 (GMT) |
| commit | 07e1b6615e868af6434bb8e42dc2d44a51075204 (patch) | |
| tree | 5bc94729576e561eae6bb9470dda0ab61b439f18 /src/declarative/qml/qmlengine_p.h | |
| parent | 1d14bbef27945d7823e9c32745e51d187093f1b7 (diff) | |
| parent | 30d8810bfab9c8157f80e5e38beda1ad8c0acfb0 (diff) | |
| download | Qt-07e1b6615e868af6434bb8e42dc2d44a51075204.zip Qt-07e1b6615e868af6434bb8e42dc2d44a51075204.tar.gz Qt-07e1b6615e868af6434bb8e42dc2d44a51075204.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
doc/src/declarative/globalobject.qdoc
Diffstat (limited to 'src/declarative/qml/qmlengine_p.h')
| -rw-r--r-- | src/declarative/qml/qmlengine_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h index f5bc015..53d867d 100644 --- a/src/declarative/qml/qmlengine_p.h +++ b/src/declarative/qml/qmlengine_p.h @@ -98,6 +98,7 @@ class QmlTypeNameCache; class QmlComponentAttached; class QmlListScriptClass; class QmlCleanup; +class QmlBindingData; class QmlEnginePrivate : public QObjectPrivate { @@ -143,6 +144,10 @@ public: // Registered cleanup handlers QmlCleanup *cleanup; + // Bindings that have had errors during startup + QmlBindingData *erroredBindings; + int inProgressCreations; + struct QmlScriptEngine : public QScriptEngine { QmlScriptEngine(QmlEnginePrivate *priv) |