diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-10-28 05:45:05 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-10-28 05:45:05 (GMT) |
| commit | 44be8cc3bb1aebd47f75dcf9cae54884322e1955 (patch) | |
| tree | 548c76a8a6144955a1ba1ccc85e2c9f997fafa10 /src/declarative/qml/qmlengine.cpp | |
| parent | dbba440da0677b8174d087d498d3d0dbd465548a (diff) | |
| parent | e78a0d8f7449b81c971284310e6fb255d4a9d4eb (diff) | |
| download | Qt-44be8cc3bb1aebd47f75dcf9cae54884322e1955.zip Qt-44be8cc3bb1aebd47f75dcf9cae54884322e1955.tar.gz Qt-44be8cc3bb1aebd47f75dcf9cae54884322e1955.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.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 0e239ce..3da8aa9 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -126,8 +126,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) { QScriptValue qtObject = scriptEngine.newQMetaObject(StaticQtMetaObject::get()); |