diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2013-11-26 15:28:58 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-26 17:02:04 +0100 |
| commit | 48c1382c33b77b002c1b295b9d2d6c4987526add (patch) | |
| tree | 040d5fa79403ae643b9e04773cd0ea0174f89bf7 | |
| parent | 155ec2223c8f60ae88dd72e705c3621cf490dac2 (diff) | |
Fix bad if test in QQuickWebViewPrivate::didFailLoad.
It was using and for two different error codes as David
Binderman pointed out.
Task-number: QTBUG-39425
Change-Id: I85348d8ba07757eb33eceb447adb34cc2e4e1842
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp index 07e606881..31a8d1a54 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp @@ -433,7 +433,7 @@ void QQuickWebViewPrivate::didFailLoad(WKPageRef, WKFrameRef frame, WKErrorRef e } int errorCode = error.errorCode(); - if (errorCode == kWKErrorCodeFrameLoadInterruptedByPolicyChange && errorCode == kWKErrorCodePlugInWillHandleLoad) { + if (errorCode == kWKErrorCodeFrameLoadInterruptedByPolicyChange || errorCode == kWKErrorCodePlugInWillHandleLoad) { QWebLoadRequest loadRequest(q->url(), QQuickWebView::LoadSucceededStatus); q->emitUrlChangeIfNeeded(); emit q->loadingChanged(&loadRequest); |