Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I7b0dae978357c6f48826ad8e09a8cb8477d1901d

1 files changed, 8 insertions, 1 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 5c3ca2634..7bca4e3cd 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -442,7 +442,6 @@ bool QQuickWebEngineViewPrivate::isFullScreen() const
 void QQuickWebEngineViewPrivate::javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, int lineNumber, const QString& sourceID)
 {
     Q_Q(QQuickWebEngineView);
-    Q_UNUSED(level);
     Q_EMIT q->javaScriptConsoleMessage(static_cast<QQuickWebEngineView::JavaScriptConsoleMessageLevel>(level), message, lineNumber, sourceID);
 }
 
@@ -667,6 +666,14 @@ void QQuickWebEngineView::reload()
     d->adapter->reload();
 }
 
+void QQuickWebEngineView::reloadAndBypassCache()
+{
+    Q_D(QQuickWebEngineView);
+    if (!d->adapter)
+        return;
+    d->adapter->reloadAndBypassCache();
+}
+
 void QQuickWebEngineView::stop()
 {
     Q_D(QQuickWebEngineView);