diff options
author | Yann Bodson <yann.bodson@nokia.com> | 2010-03-05 01:19:30 (GMT) |
---|---|---|
committer | Yann Bodson <yann.bodson@nokia.com> | 2010-03-05 01:19:30 (GMT) |
commit | 2a2ad1e632352849c1ae54a8116f2eb699268515 (patch) | |
tree | 22fbe3b8d217a9dcb7a644ebbc6bdfeffe29344a /src/script/api/qscriptengine.cpp | |
parent | 24a94c1b88fc72243c53e1bf51b87dc0d0be41b7 (diff) | |
parent | 1cdaca2823a7c09f377ab205e6424e35febcbf2c (diff) | |
download | Qt-2a2ad1e632352849c1ae54a8116f2eb699268515.zip Qt-2a2ad1e632352849c1ae54a8116f2eb699268515.tar.gz Qt-2a2ad1e632352849c1ae54a8116f2eb699268515.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 |