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

Conflicts:
	src/core/browser_context_qt.cpp
	src/webengine/api/qquickwebengineview_p.h

Change-Id: I73bdec03b627b282851d7dda12006d4ab631072c

1 files changed, 4 insertions, 1 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index ce53d4f8a..3a6b8cb21 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -242,6 +242,7 @@ void QQuickWebEngineViewPrivate::urlChanged(const QUrl &url)
 {
     Q_Q(QQuickWebEngineView);
     Q_UNUSED(url);
+    explicitUrl = QUrl();
     Q_EMIT q->urlChanged();
 }
 
@@ -310,6 +311,7 @@ void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, int
         return;
     }
     if (success) {
+        explicitUrl = QUrl();
         QQuickWebEngineLoadRequest loadRequest(url, QQuickWebEngineView::LoadSucceededStatus);
         Q_EMIT q->loadingChanged(&loadRequest);
         return;
@@ -514,7 +516,7 @@ QQuickWebEngineView::~QQuickWebEngineView()
 QUrl QQuickWebEngineView::url() const
 {
     Q_D(const QQuickWebEngineView);
-    return d->adapter->activeUrl();
+    return d->explicitUrl.isValid() ? d->explicitUrl : d->adapter->activeUrl();
 }
 
 void QQuickWebEngineView::setUrl(const QUrl& url)
@@ -523,6 +525,7 @@ void QQuickWebEngineView::setUrl(const QUrl& url)
         return;
 
     Q_D(QQuickWebEngineView);
+    d->explicitUrl = url;
     d->adapter->load(url);
 }