diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-03-05 04:01:03 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-03-05 04:01:03 (GMT) |
| commit | cb486319b599eccbc40166d0b3d057d11d92759c (patch) | |
| tree | cfa2d0f3bb88e266a96f5a8218c3ac70a823cf08 /src/script/api/qscriptengine.cpp | |
| parent | 09e39c9c86e8ed346aff348b28c512710862e70e (diff) | |
| parent | 0c558e05f880cb51078b2d5e5281227352c1de3f (diff) | |
| download | Qt-cb486319b599eccbc40166d0b3d057d11d92759c.zip Qt-cb486319b599eccbc40166d0b3d057d11d92759c.tar.gz Qt-cb486319b599eccbc40166d0b3d057d11d92759c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 47c5262..024b4d0 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -1591,7 +1591,9 @@ QRegExp QScriptEnginePrivate::toRegExp(JSC::ExecState *exec, JSC::JSValue value) QVariant QScriptEnginePrivate::toVariant(JSC::ExecState *exec, JSC::JSValue value) { - if (isObject(value)) { + if (!value) { + return QVariant(); + } else if (isObject(value)) { if (isVariant(value)) return variantValue(value); #ifndef QT_NO_QOBJECT |