diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-02 00:19:08 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-02 00:19:08 (GMT) |
| commit | 8eb8ff349daa8915cf9823e5228ec2ccf2460b15 (patch) | |
| tree | e9e0f2027516cbd24756021cdf8d19700dcc302a /src/declarative/qml | |
| parent | 7d566bc4eb5b5e47b48f28012fed24109a8dd735 (diff) | |
| parent | b52bfac9d05de835682b9c2b2e1d79e0246e708a (diff) | |
| download | Qt-8eb8ff349daa8915cf9823e5228ec2ccf2460b15.zip Qt-8eb8ff349daa8915cf9823e5228ec2ccf2460b15.tar.gz Qt-8eb8ff349daa8915cf9823e5228ec2ccf2460b15.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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 652144d..9a5efdb 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -565,7 +565,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)); } /*! |