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

Conflicts:
	src/3rdparty
	src/webengine/api/qquickwebenginecertificateerror.cpp
	src/webengine/doc/src/webengineview.qdoc
	tools/qmake/config.tests/libcap/libcap.cpp

Change-Id: I2a2cfc904a8d6b561fb71ef7a0cc4bfb860124db

6 files changed, 48 insertions, 53 deletions

diff --git a/src/webengine/api/qquickwebenginecertificateerror.cpp b/src/webengine/api/qquickwebenginecertificateerror.cpp
index 5d17f75b2..51a942abe 100644
--- a/src/webengine/api/qquickwebenginecertificateerror.cpp
+++ b/src/webengine/api/qquickwebenginecertificateerror.cpp
@@ -163,21 +163,35 @@ QUrl QQuickWebEngineCertificateError::url() const
 
     The type of the error.
 
-    \value SslPinnedKeyNotInCertificateChain The certificate did not match the built-in public keys
-           pinned for the host name.
-    \value CertificateCommonNameInvalid The certificate's common name did not match the host name.
-    \value CertificateDateInvalid The certificate is not valid at the current date and time.
-    \value CertificateAuthorityInvalid The certificate is not signed by a trusted authority.
-    \value CertificateContainsErrors The certificate contains errors.
-    \value CertificateNoRevocationMechanism The certificate has no mechanism for determining if it has been revoked.
-    \value CertificateUnableToCheckRevocation Revocation information for the certificate is not available.
-    \value CertificateRevoked The certificate has been revoked.
-    \value CertificateInvalid The certificate is invalid.
-    \value CertificateWeakSignatureAlgorithm The certificate is signed using a weak signature algorithm.
-    \value CertificateNonUniqueName The host name specified in the certificate is not unique.
-    \value CertificateWeakKey The certificate contains a weak key.
-    \value CertificateNameConstraintViolation The certificate claimed DNS names that are in violation of name constraints.
-    \value CertificateValidityTooLong The certificate has a validity period that is too long
+    \value  WebEngineCertificateError.SslPinnedKeyNotInCertificateChain
+            The certificate did not match the built-in public keys pinned for
+            the host name.
+    \value  WebEngineCertificateError.CertificateCommonNameInvalid
+            The certificate's common name did not match the host name.
+    \value  WebEngineCertificateError.CertificateDateInvalid
+            The certificate is not valid at the current date and time.
+    \value  WebEngineCertificateError.CertificateAuthorityInvalid
+            The certificate is not signed by a trusted authority.
+    \value  WebEngineCertificateError.CertificateContainsErrors
+            The certificate contains errors.
+    \value  WebEngineCertificateError.CertificateNoRevocationMechanism
+            The certificate has no mechanism for determining if it has been
+            revoked.
+    \value  WebEngineCertificateError.CertificateUnableToCheckRevocation
+            Revocation information for the certificate is not available.
+    \value  WebEngineCertificateError.CertificateRevoked
+            The certificate has been revoked.
+    \value  WebEngineCertificateError.CertificateInvalid
+            The certificate is invalid.
+    \value  WebEngineCertificateError.CertificateWeakSignatureAlgorithm
+            The certificate is signed using a weak signature algorithm.
+    \value  WebEngineCertificateError.CertificateNonUniqueName
+            The host name specified in the certificate is not unique.
+    \value  WebEngineCertificateError.CertificateWeakKey
+            The certificate contains a weak key.
+    \value  WebEngineCertificateError.CertificateNameConstraintViolation
+            The certificate claimed DNS names that are in violation of name
+            constraints.
     \value  WebEngineCertificateError.CertificateValidityTooLong
             The certificate has a validity period that is too long.
             (Added in 5.7)
diff --git a/src/webengine/api/qquickwebenginedownloaditem.cpp b/src/webengine/api/qquickwebenginedownloaditem.cpp
index 247e48da5..a8467d656 100644
--- a/src/webengine/api/qquickwebenginedownloaditem.cpp
+++ b/src/webengine/api/qquickwebenginedownloaditem.cpp
@@ -178,13 +178,13 @@ quint32 QQuickWebEngineDownloadItem::id() const
 
     Describes the state of the download:
 
-    \value  DownloadRequested
+    \value  WebEngineDownloadItem.DownloadRequested
             Download has been requested, but it has not been accepted yet.
-    \value  DownloadInProgress
+    \value  WebEngineDownloadItem.DownloadInProgress
             Download is in progress.
-    \value  DownloadCompleted
+    \value  WebEngineDownloadItem.DownloadCompleted
             Download completed successfully.
-    \value  DownloadInterrupted
+    \value  WebEngineDownloadItem.DownloadInterrupted
             Download has been interrupted (by the server or because of lost connectivity).
 */
 
diff --git a/src/webengine/api/qquickwebengineloadrequest.cpp b/src/webengine/api/qquickwebengineloadrequest.cpp
index 74043c302..47ec17c16 100644
--- a/src/webengine/api/qquickwebengineloadrequest.cpp
+++ b/src/webengine/api/qquickwebengineloadrequest.cpp
@@ -97,9 +97,10 @@ QUrl QQuickWebEngineLoadRequest::url() const
 
     This enumeration represents the load status of a web page load request:
 
-    \value WebEngineView::LoadStartedStatus Page is currently loading.
-    \value WebEngineView::LoadSucceededStatus Page has been loaded with success.
-    \value WebEngineView::LoadFailedStatus Page could not be loaded.
+    \value  WebEngineLoadRequest.LoadStartedStatus Page is currently loading.
+    \value  WebEngineLoadRequest.LoadSucceededStatus
+            Page has been loaded with success.
+    \value  WebEngineLoadRequest.LoadFailedStatus Page could not be loaded.
 
     \sa WebEngineView::loadingChanged
 */
diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp
index 2f8188c9d..191105e52 100644
--- a/src/webengine/api/qquickwebengineprofile.cpp
+++ b/src/webengine/api/qquickwebengineprofile.cpp
@@ -466,10 +466,10 @@ void QQuickWebEngineProfile::setHttpUserAgent(const QString &userAgent)
 
     This enumeration describes the type of the HTTP cache:
 
-    \value  MemoryHttpCache
+    \value  WebEngineProfile.MemoryHttpCache
             Uses an in-memory cache. This is the only setting possible if offTheRecord is set or
             no persistentStoragePath is available.
-    \value  DiskHttpCache
+    \value  WebEngineProfile.DiskHttpCache
             Uses a disk cache. This is the default value.
     \value  WebEngineProfile.NoCache
             Disables caching. (Added in 5.7)
@@ -503,13 +503,13 @@ void QQuickWebEngineProfile::setHttpCacheType(QQuickWebEngineProfile::HttpCacheT
 
     This enumeration describes the policy of cookie persistency:
 
-    \value  NoPersistentCookies
+    \value  WebEngineProfile.NoPersistentCookies
             Both session and persistent cookies are stored in memory. This is the only setting
             possible if offTheRecord is set or no persistentStoragePath is available.
-    \value  AllowPersistentCookies
+    \value  WebEngineProfile.AllowPersistentCookies
             Cookies marked persistent are saved to and restored from disk, whereas session cookies
             are only stored to disk for crash recovery. This is the default setting.
-    \value  ForcePersistentCookies
+    \value WebEngineProfile.ForcePersistentCookies
             Both session and persistent cookies are saved to and restored from disk.
 */
 
diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp
index 8802a40f6..a1c903df3 100644
--- a/src/webengine/api/qquickwebenginescript.cpp
+++ b/src/webengine/api/qquickwebenginescript.cpp
@@ -159,13 +159,13 @@ ASSERT_ENUMS_MATCH(QQuickWebEngineScript::DocumentCreation, UserScript::Document
     The point in the loading process at which the script will be executed.
     The default value is \c Deferred.
 
-    \value DocumentCreation
+    \value WebEngineScript.DocumentCreation
            The script will be executed as soon as the document is created. This is not suitable for
            any DOM operation.
-    \value DocumentReady
+    \value WebEngineScript.DocumentReady
            The script will run as soon as the DOM is ready. This is equivalent to the
            \c DOMContentLoaded event firing in JavaScript.
-    \value Deferred
+    \value WebEngineScript.Deferred
            The script will run when the page load finishes, or 500 ms after the document is ready,
            whichever comes first.
 */
@@ -180,13 +180,13 @@ QQuickWebEngineScript::InjectionPoint QQuickWebEngineScript::injectionPoint() co
 
     The world ID defining which isolated world the script is executed in.
 
-    \value MainWorld
+    \value WebEngineScript.MainWorld
            The world used by the page's web contents. It can be useful in order to expose custom
            functionality to web contents in certain scenarios.
-    \value ApplicationWorld
+    \value WebEngineScript.ApplicationWorld
            The default isolated world used for application level functionality implemented in
            JavaScript.
-    \value UserWorld
+    \value WebEngineScript.UserWorld
            The first isolated world to be used by scripts set by users if the application is not
            making use of more worlds. As a rule of thumb, if that functionality is exposed to the
            application users, each individual script should probably get its own isolated world.
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 67a41f659..5087199cc 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -1039,14 +1039,6 @@ void QQuickWebEngineView::setTestSupport(QQuickWebEngineTestSupport *testSupport
 
 #endif
 
-/*!
- * \qmlproperty bool WebEngineView::activeFocusOnPress
- * \since QtWebEngine 1.2
- *
- * This property specifies whether the view should gain active focus when pressed.
- * The default value is true.
- *
- */
 bool QQuickWebEngineView::activeFocusOnPress() const
 {
     Q_D(const QQuickWebEngineView);
@@ -1204,18 +1196,6 @@ qreal QQuickWebEngineView::zoomFactor() const
     return d->adapter->currentZoomFactor();
 }
 
-/*!
-    \qmlproperty bool WebEngineView::backgroundColor
-    \since QtWebEngine 1.2
-
-    Sets this property to change the color of the WebEngineView's background,
-    behing the document's body. You can set it to "transparent" or to a translucent
-    color to see through the document, or you can set this color to match your
-    web content in an hybrid app to prevent the white flashes that may appear
-    during loading.
-
-    The default value is white.
-*/
 QColor QQuickWebEngineView::backgroundColor() const
 {
     Q_D(const QQuickWebEngineView);