diff options
| author | aavit <qt-info@nokia.com> | 2010-03-05 10:06:05 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-03-05 10:06:05 (GMT) |
| commit | ce1d5d10d0316a05a2bfce09239fd532a2d5ca7e (patch) | |
| tree | 5eb7ed4e95bc0f08e4a805eaceb731e71d04c2ab /src/script/api/qscriptengine.cpp | |
| parent | 512593cb8db6242eda631b8c71d22e2d154abc98 (diff) | |
| parent | 4152244217ab7f34e67f7800cb796d8923061f49 (diff) | |
| download | Qt-ce1d5d10d0316a05a2bfce09239fd532a2d5ca7e.zip Qt-ce1d5d10d0316a05a2bfce09239fd532a2d5ca7e.tar.gz Qt-ce1d5d10d0316a05a2bfce09239fd532a2d5ca7e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 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 |