diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-06-04 13:37:56 (GMT) |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-06-04 13:37:56 (GMT) |
| commit | 2dcbb2efac5f5722e1980c01dd8ec0adaec114f3 (patch) | |
| tree | efb397c1e114ef145451b985ad490f3b8482b184 /src/script/qscriptengine.cpp | |
| parent | 30971fa4ffaeb4c2a3a1267cca73311fb9834241 (diff) | |
| parent | 95c0a8de7af1e631485117f5764f4e2677ec6d0b (diff) | |
| download | Qt-2dcbb2efac5f5722e1980c01dd8ec0adaec114f3.zip Qt-2dcbb2efac5f5722e1980c01dd8ec0adaec114f3.tar.gz Qt-2dcbb2efac5f5722e1980c01dd8ec0adaec114f3.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/script/qscriptengine.cpp')
| -rw-r--r-- | src/script/qscriptengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/qscriptengine.cpp b/src/script/qscriptengine.cpp index d8908ed..97021fc 100644 --- a/src/script/qscriptengine.cpp +++ b/src/script/qscriptengine.cpp @@ -587,7 +587,7 @@ QScriptValue QScriptEngine::newQObject(const QScriptValue &scriptObject, QScriptValuePrivate *p = QScriptValuePrivate::get(scriptObject); if (!p || !p->value.isObject()) return newQObject(qtObject, ownership, options); - if (p->value.isVariant()) { + if (p->value.isQObject()) { QScript::ExtQObject::Instance *data; data = d->qobjectConstructor->get(p->value); Q_ASSERT(data != 0); |