diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-02 02:09:10 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-02 02:09:10 (GMT) |
| commit | 9317724be9d588ba8616e3cbf6300f9c32a64ede (patch) | |
| tree | bf62acdd44899207d699e9a58aff209fa7deabdd /src/declarative/qml | |
| parent | 10b440d4621dc5b6b0380c566458facef2942085 (diff) | |
| parent | 8eed5aa528f668acfa1831432f97f7333c7d9e71 (diff) | |
| download | Qt-9317724be9d588ba8616e3cbf6300f9c32a64ede.zip Qt-9317724be9d588ba8616e3cbf6300f9c32a64ede.tar.gz Qt-9317724be9d588ba8616e3cbf6300f9c32a64ede.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qmlengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 6eeff89..124c8f3 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -652,7 +652,7 @@ QScriptValue QmlEnginePrivate::qmlScriptObject(QObject* object, QmlEngine* engine) { QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine); - return scriptEngine->newObject(new QmlObjectScriptClass(engine), scriptEngine->newQObject(object)); + return scriptEngine->newObject(engine->d_func()->objectClass, scriptEngine->newQObject(object, QScriptEngine::AutoOwnership)); } /*! |