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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/declarative/qml/qmlengine.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 8581751..426ebc6 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -118,8 +118,9 @@ static QString userLocalDataPath(const QString& app) QmlEnginePrivate::QmlEnginePrivate(QmlEngine *e) : rootContext(0), currentExpression(0), isDebugging(false), contextClass(0), objectClass(0), valueTypeClass(0), globalClass(0), - nodeListClass(0), namedNodeMapClass(0), sqlQueryClass(0), cleanup(0), scriptEngine(this), - componentAttacheds(0), rootComponent(0), networkAccessManager(0), typeManager(e), uniqueId(1) + nodeListClass(0), namedNodeMapClass(0), sqlQueryClass(0), cleanup(0), erroredBindings(0), + inProgressCreations(0), scriptEngine(this), componentAttacheds(0), rootComponent(0), + networkAccessManager(0), typeManager(e), uniqueId(1) { // Note that all documentation for stuff put on the global object goes in // doc/src/declarative/globalobject.qdoc |