diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-01-08 04:33:25 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-01-08 04:33:25 (GMT) |
| commit | 36aef0b2c67a879a148b1f82d51e252968da0578 (patch) | |
| tree | 92cef73e6bb3a597da108f006cf5cc30bebbd568 /src/declarative/qml/qmlengine.cpp | |
| parent | 9151c4838ac7428107246abb9c99f296ab395c3d (diff) | |
| parent | 6db0dd65bdb9d999f5f5bbb54808517d3d212315 (diff) | |
| download | Qt-36aef0b2c67a879a148b1f82d51e252968da0578.zip Qt-36aef0b2c67a879a148b1f82d51e252968da0578.tar.gz Qt-36aef0b2c67a879a148b1f82d51e252968da0578.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 | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index e7d0743..708cdd1 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -117,11 +117,11 @@ struct StaticQtMetaObject : public QObject }; QmlEnginePrivate::QmlEnginePrivate(QmlEngine *e) -: rootContext(0), currentExpression(0), - isDebugging(false), contextClass(0), sharedContext(0), sharedScope(0), objectClass(0), valueTypeClass(0), globalClass(0), - cleanup(0), erroredBindings(0), - inProgressCreations(0), scriptEngine(this), workerScriptEngine(0), componentAttacheds(0), - inBeginCreate(false), networkAccessManager(0), typeManager(e), uniqueId(1) +: captureProperties(false), rootContext(0), currentExpression(0), isDebugging(false), + contextClass(0), sharedContext(0), sharedScope(0), objectClass(0), valueTypeClass(0), + globalClass(0), cleanup(0), erroredBindings(0), inProgressCreations(0), + scriptEngine(this), workerScriptEngine(0), componentAttacheds(0), inBeginCreate(false), + networkAccessManager(0), typeManager(e), uniqueId(1) { globalClass = new QmlGlobalScriptClass(&scriptEngine); fileImportPath.append(QLibraryInfo::location(QLibraryInfo::DataPath)+QDir::separator()+QLatin1String("qml")); @@ -138,10 +138,7 @@ QUrl QmlScriptEngine::resolvedUrl(QScriptContext *context, const QUrl& url) } QmlScriptEngine::QmlScriptEngine(QmlEnginePrivate *priv) - : p(priv), - sqlQueryClass(0), - namedNodeMapClass(0), - nodeListClass(0) +: p(priv), sqlQueryClass(0), namedNodeMapClass(0), nodeListClass(0) { // Note that all documentation for stuff put on the global object goes in // doc/src/declarative/globalobject.qdoc |