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

Conflicts:
	.qmake.conf
	src/3rdparty
	src/core/content_browser_client_qt.h
	src/core/core_module.pro

Change-Id: Ia05a6564a4d17ca14ff9b76ae018c3f4ef33d535

2 files changed, 33 insertions, 2 deletions

diff --git a/src/webenginewidgets/api/qwebenginecertificateerror.cpp b/src/webenginewidgets/api/qwebenginecertificateerror.cpp
index 7be8c75d0..bf7239cf3 100644
--- a/src/webenginewidgets/api/qwebenginecertificateerror.cpp
+++ b/src/webenginewidgets/api/qwebenginecertificateerror.cpp
@@ -38,6 +38,15 @@
 
 QT_BEGIN_NAMESPACE
 
+/*!
+    \class QWebEngineCertificateError
+    \brief The QWebEngineCertificateError class provides information about a certificate error.
+
+    \inmodule QtWebEngineWidgets
+
+    QWebEngineCertificateError holds known information about a certificate error to be used to determine whether to allow it or not, and to be reported to the user.
+*/
+
 class QWebEngineCertificateErrorPrivate {
 public:
     QWebEngineCertificateErrorPrivate(int error, QUrl url, bool overridable, QString errorDescription);
@@ -56,15 +65,39 @@ QWebEngineCertificateErrorPrivate::QWebEngineCertificateErrorPrivate(int error,
 { }
 
 
+/*! \internal
+*/
 QWebEngineCertificateError::QWebEngineCertificateError(int error, QUrl url, bool overridable, QString errorDescription)
     : d_ptr(new QWebEngineCertificateErrorPrivate(error, url, overridable, errorDescription))
 { }
 
+/*! \internal
+*/
 QWebEngineCertificateError::~QWebEngineCertificateError()
 {
 }
 
 /*!
+    \enum QWebEngineCertificateError::Error
+
+    This enum describes the type of certificate error encountered.
+
+    \value SslPinnedKeyNotInCertificateChain The certificate did not match the built-in public key pins 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.
+*/
+
+/*!
     Returns whether this error can be overridden and accepted.
 
     \sa error(), errorDescription()
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro
index aabcc710d..638535bbc 100644
--- a/src/webenginewidgets/webenginewidgets.pro
+++ b/src/webenginewidgets/webenginewidgets.pro
@@ -1,7 +1,5 @@
 TARGET = QtWebEngineWidgets
 
-CMAKE_MODULE_TESTS = "-"
-
 # For our export macros
 DEFINES += QT_BUILD_WEBENGINEWIDGETS_LIB