Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/webengine/api/qquickwebenginesettings.cpp

Change-Id: Ib7e2a7558c685410c49c455218d3b9c30f32358f

5 files changed, 14 insertions, 12 deletions

diff --git a/src/core/resource_dispatcher_host_delegate_qt.h b/src/core/resource_dispatcher_host_delegate_qt.h
index 6481c6438..90797dbbf 100644
--- a/src/core/resource_dispatcher_host_delegate_qt.h
+++ b/src/core/resource_dispatcher_host_delegate_qt.h
@@ -76,7 +76,7 @@ private:
     int m_renderProcessId;
     int m_renderFrameId;
 
-    net::AuthChallengeInfo *m_authInfo;
+    scoped_refptr<net::AuthChallengeInfo> m_authInfo;
 
     // The request that wants login data.
     // Must only be accessed on the IO thread.
diff --git a/src/webengine/api/qquickwebenginedownloaditem.cpp b/src/webengine/api/qquickwebenginedownloaditem.cpp
index a8467d656..9f0c747f9 100644
--- a/src/webengine/api/qquickwebenginedownloaditem.cpp
+++ b/src/webengine/api/qquickwebenginedownloaditem.cpp
@@ -162,7 +162,7 @@ void QQuickWebEngineDownloadItem::cancel()
 }
 
 /*!
-    \qmlproperty quint32 WebEngineDownloadItem::id
+    \qmlproperty int WebEngineDownloadItem::id
 
     Holds the download item's ID.
 */
@@ -221,7 +221,7 @@ qint64 QQuickWebEngineDownloadItem::receivedBytes() const
 }
 
 /*!
-    \qmlproperty QString WebEngineDownloadItem::mimeType
+    \qmlproperty string WebEngineDownloadItem::mimeType
     \since QtWebEngine 1.2
 
     Holds the MIME type of the download.
@@ -234,7 +234,7 @@ QString QQuickWebEngineDownloadItem::mimeType() const
 }
 
 /*!
-    \qmlproperty QString WebEngineDownloadItem::path
+    \qmlproperty string WebEngineDownloadItem::path
 
     Holds the full target path where data is being downloaded to.
 
diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp
index 191105e52..d660f639d 100644
--- a/src/webengine/api/qquickwebengineprofile.cpp
+++ b/src/webengine/api/qquickwebengineprofile.cpp
@@ -283,7 +283,7 @@ QQuickWebEngineProfile::~QQuickWebEngineProfile()
 }
 
 /*!
-    \qmlproperty QString WebEngineProfile::storageName
+    \qmlproperty string WebEngineProfile::storageName
 
     The storage name that is used to create separate subdirectories for each profile that uses
     the disk for storing persistent data and cache.
@@ -362,7 +362,7 @@ void QQuickWebEngineProfile::setOffTheRecord(bool offTheRecord)
 }
 
 /*!
-    \qmlproperty QString WebEngineProfile::persistentStoragePath
+    \qmlproperty string WebEngineProfile::persistentStoragePath
 
     The path to the location where the persistent data for the browser and web content are
     stored. Persistent data includes persistent cookies, HTML5 local storage, and visited links.
@@ -399,7 +399,7 @@ void QQuickWebEngineProfile::setPersistentStoragePath(const QString &path)
 }
 
 /*!
-    \qmlproperty QString WebEngineProfile::cachePath
+    \qmlproperty string WebEngineProfile::cachePath
 
     The path to the location where the profile's caches are stored, in particular the HTTP cache.
 
@@ -434,7 +434,7 @@ void QQuickWebEngineProfile::setCachePath(const QString &path)
 }
 
 /*!
-    \qmlproperty QString WebEngineProfile::httpUserAgent
+    \qmlproperty string WebEngineProfile::httpUserAgent
 
     The user-agent string sent with HTTP to identify the browser.
 */
@@ -569,7 +569,7 @@ void QQuickWebEngineProfile::setHttpCacheMaximumSize(int maximumSize)
 }
 
 /*!
-    \qmlproperty QString WebEngineProfile::httpAcceptLanguage
+    \qmlproperty string WebEngineProfile::httpAcceptLanguage
 
     The value of the Accept-Language HTTP request-header field.
 
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp
index 09fb2b98d..b12e59576 100644
--- a/src/webengine/api/qquickwebenginesettings.cpp
+++ b/src/webengine/api/qquickwebenginesettings.cpp
@@ -304,7 +304,7 @@ bool QQuickWebEngineSettings::touchIconsEnabled() const
 }
 
 /*!
-    \qmlproperty QString WebEngineSettings::defaultTextEncoding
+    \qmlproperty string WebEngineSettings::defaultTextEncoding
     \since QtWebEngine 1.2
 
     Sets the default encoding. The value must be a string describing an encoding such as "utf-8" or
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 5087199cc..31a258b0c 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -797,8 +797,10 @@ void QQuickWebEngineViewPrivate::adoptWebContents(WebContentsAdapter *webContent
 
     // This throws away the WebContentsAdapter that has been used until now.
     // All its states, particularly the loading URL, are replaced by the adopted WebContentsAdapter.
-    WebContentsAdapterOwner *adapterOwner = new WebContentsAdapterOwner(adapter->sharedFromThis());
-    adapterOwner->deleteLater();
+    if (adapter) {
+        WebContentsAdapterOwner *adapterOwner = new WebContentsAdapterOwner(adapter->sharedFromThis());
+        adapterOwner->deleteLater();
+    }
     adapter = webContents->sharedFromThis();
     adapter->initialize(this);