diff options
| author | Kavindra Devi Palaraja <kavindra.palaraja@nokia.com> | 2009-03-26 14:49:31 (GMT) |
|---|---|---|
| committer | Kavindra Devi Palaraja <kavindra.palaraja@nokia.com> | 2009-03-26 14:49:31 (GMT) |
| commit | ad0a4d814c8f3fb18be32da5d344d6f356225b6f (patch) | |
| tree | 40ffdf25e34b50c08911d453f8652bb157332ff3 /src | |
| parent | 7d61ee2d0b040d691e6495199ac781ce55cf521a (diff) | |
| parent | 9ffc533ffbba156ff69dc1bd3a9a4a2cb53b68af (diff) | |
| download | Qt-ad0a4d814c8f3fb18be32da5d344d6f356225b6f.zip Qt-ad0a4d814c8f3fb18be32da5d344d6f356225b6f.tar.gz Qt-ad0a4d814c8f3fb18be32da5d344d6f356225b6f.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src')
| -rw-r--r-- | src/script/qscriptengine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/script/qscriptengine.cpp b/src/script/qscriptengine.cpp index d4e1923..d8908ed 100644 --- a/src/script/qscriptengine.cpp +++ b/src/script/qscriptengine.cpp @@ -1169,7 +1169,8 @@ bool QScriptEngine::convert(const QScriptValue &value, int type, void *ptr) bool QScriptEngine::convertV2(const QScriptValue &value, int type, void *ptr) { QScriptValueImpl impl = QScriptValuePrivate::valueOf(value); - return QScriptEnginePrivate::convert(impl, type, ptr, /*engine=*/0); + QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(value.engine()); + return QScriptEnginePrivate::convert(impl, type, ptr, eng_p); } /*! |