diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-31 10:18:15 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-31 10:18:15 (GMT) |
| commit | 5d3a2b852aaaa66f120ab4d8618900dfa603e359 (patch) | |
| tree | 79e86f692bb3b56eb02dd5797ab20b1e5c34470c /src/script/api/qscriptvalue.cpp | |
| parent | c9e10372b59584c99f225bdf5453f0f03b9d5f59 (diff) | |
| parent | ae88ef4063548816efd4371920deeb4d87ea98f4 (diff) | |
| download | Qt-5d3a2b852aaaa66f120ab4d8618900dfa603e359.zip Qt-5d3a2b852aaaa66f120ab4d8618900dfa603e359.tar.gz Qt-5d3a2b852aaaa66f120ab4d8618900dfa603e359.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/script/api/qscriptvalue.cpp')
| -rw-r--r-- | src/script/api/qscriptvalue.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp index d5aaed7..eb0460a 100644 --- a/src/script/api/qscriptvalue.cpp +++ b/src/script/api/qscriptvalue.cpp @@ -2431,7 +2431,6 @@ void QScriptValue::setScriptClass(QScriptClass *scriptClass) QScriptObject *scriptObject = static_cast<QScriptObject*>(JSC::asObject(d->jscValue)); QScriptObjectDelegate *delegate = scriptObject->delegate(); if (!delegate || (delegate->type() != QScriptObjectDelegate::ClassObject)) { - delete delegate; delegate = new QScript::ClassObjectDelegate(scriptClass); scriptObject->setDelegate(delegate); } |