diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-18 22:15:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-18 22:15:27 +0200 |
| commit | f27089657a207ef8c5c9d27d661d3d12c3af8df2 (patch) | |
| tree | c3ff29d73bbe20cb307649367cb97eb15b6989ed /Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp | |
| parent | ce29c5f019ffe0ceec6eb9be3d82e1c061d0d530 (diff) | |
| parent | 0b48569e2bf9afc1b6ca5e359c3a948dd8c77619 (diff) | |
| download | qtwebkit-f27089657a207ef8c5c9d27d661d3d12c3af8df2.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into 5.95.9.0
Change-Id: Ib8d14ead6c781186d2519366552b896327d4f715
Diffstat (limited to 'Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp index bc2d5d21c..5300a40ff 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp @@ -131,6 +131,11 @@ static QJSValue buildQJSValue(QJSEngine* engine, JSGlobalContextRef context, JSV return var; switch (JSValueGetType(context, value)) { + case kJSTypeUndefined: + break; + case kJSTypeNull: + var = QJSValue(QJSValue::NullValue); + break; case kJSTypeBoolean: var = QJSValue(JSValueToBoolean(context, value)); break; |