diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-10-14 03:19:12 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-10-14 03:19:12 (GMT) |
| commit | 513cc4be0bec4a5fb303062ecbecf87708dc0e9b (patch) | |
| tree | 712fd548b8886c52ccca054756e31b8cc4494048 /src/declarative/qml/qmlengine.cpp | |
| parent | f4d605eb2dddad17638d69d6024bc3d0efc878e6 (diff) | |
| parent | cca9125431672193e93676ebd449c48664b52ba3 (diff) | |
| download | Qt-513cc4be0bec4a5fb303062ecbecf87708dc0e9b.zip Qt-513cc4be0bec4a5fb303062ecbecf87708dc0e9b.tar.gz Qt-513cc4be0bec4a5fb303062ecbecf87708dc0e9b.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 2bec140..d5f64c2 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -125,8 +125,8 @@ 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), scriptEngine(this), rootComponent(0), - networkAccessManager(0), typeManager(e), uniqueId(1) + nodeListClass(0), namedNodeMapClass(0), sqlQueryClass(0), scriptEngine(this), + componentAttacheds(0), rootComponent(0), networkAccessManager(0), typeManager(e), uniqueId(1) { QScriptValue qtObject = scriptEngine.newQMetaObject(StaticQtMetaObject::get()); |