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

Change-Id: I3a6f92b6da850b124aae68af390211b613d3d640

6 files changed, 21 insertions, 12 deletions

diff --git a/src/webenginewidgets/api/qwebenginecertificateerror.cpp b/src/webenginewidgets/api/qwebenginecertificateerror.cpp
index a0641c9dd..f04b73615 100644
--- a/src/webenginewidgets/api/qwebenginecertificateerror.cpp
+++ b/src/webenginewidgets/api/qwebenginecertificateerror.cpp
@@ -47,7 +47,8 @@ QT_BEGIN_NAMESPACE
     \since 5.4
     \inmodule QtWebEngineWidgets
 
-    Provides information about a certificate error.
+    Provides information about a certificate error. This class is used as a parameter of
+    QWebEnginePage::certificateError().
 */
 
 class QWebEngineCertificateErrorPrivate {
diff --git a/src/webenginewidgets/api/qwebenginehistory.cpp b/src/webenginewidgets/api/qwebenginehistory.cpp
index 41de8c90b..48ddbc48e 100644
--- a/src/webenginewidgets/api/qwebenginehistory.cpp
+++ b/src/webenginewidgets/api/qwebenginehistory.cpp
@@ -226,9 +226,7 @@ QWebEngineHistoryItem QWebEngineHistory::backItem() const
 
 QWebEngineHistoryItem QWebEngineHistory::currentItem() const
 {
-    Q_D(const QWebEngineHistory);
-    d->updateItems();
-    return d->items[currentItemIndex()];
+    return itemAt(currentItemIndex());
 }
 
 QWebEngineHistoryItem QWebEngineHistory::forwardItem() const
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index bc5799aac..c7d5a19e3 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -73,13 +73,13 @@ class QWebEngineSettings;
 
 class QWEBENGINEWIDGETS_EXPORT QWebEnginePage : public QObject {
     Q_OBJECT
-    Q_PROPERTY(QString selectedText READ selectedText CONSTANT)
-    Q_PROPERTY(bool hasSelection READ hasSelection CONSTANT)
+    Q_PROPERTY(QString selectedText READ selectedText)
+    Q_PROPERTY(bool hasSelection READ hasSelection)
 
     // Ex-QWebFrame properties
-    Q_PROPERTY(QUrl requestedUrl READ requestedUrl CONSTANT)
+    Q_PROPERTY(QUrl requestedUrl READ requestedUrl)
     Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor)
-    Q_PROPERTY(QString title READ title CONSTANT)
+    Q_PROPERTY(QString title READ title)
     Q_PROPERTY(QUrl url READ url WRITE setUrl)
     Q_PROPERTY(QUrl iconUrl READ iconUrl NOTIFY iconUrlChanged)
     Q_PROPERTY(QIcon icon READ icon NOTIFY iconChanged)
@@ -134,6 +134,7 @@ public:
         ViewSource,
         WebActionCount
     };
+    Q_ENUM(WebAction)
 
     enum FindFlag {
         FindBackward = 1,
@@ -147,12 +148,14 @@ public:
         WebDialog,
         WebBrowserBackgroundTab
     };
+    Q_ENUM(WebWindowType)
 
     enum PermissionPolicy {
         PermissionUnknown,
         PermissionGrantedByUser,
         PermissionDeniedByUser
     };
+    Q_ENUM(PermissionPolicy)
 
     // must match WebContentsAdapterClient::NavigationType
     enum NavigationType {
@@ -163,6 +166,7 @@ public:
         NavigationTypeReload,
         NavigationTypeOther
     };
+    Q_ENUM(NavigationType)
 
     enum Feature {
 #ifndef Q_QDOC
@@ -174,6 +178,7 @@ public:
         MediaAudioVideoCapture,
         MouseLock
     };
+    Q_ENUM(Feature)
 
     // Ex-QWebFrame enum
 
@@ -181,6 +186,7 @@ public:
         FileSelectOpen,
         FileSelectOpenMultiple,
     };
+    Q_ENUM(FileSelectionMode)
 
     // must match WebContentsAdapterClient::JavaScriptConsoleMessageLevel
     enum JavaScriptConsoleMessageLevel {
@@ -188,6 +194,7 @@ public:
         WarningMessageLevel,
         ErrorMessageLevel
     };
+    Q_ENUM(JavaScriptConsoleMessageLevel)
 
     // must match WebContentsAdapterClient::RenderProcessTerminationStatus
     enum RenderProcessTerminationStatus {
@@ -196,6 +203,7 @@ public:
         CrashedTerminationStatus,
         KilledTerminationStatus
     };
+    Q_ENUM(RenderProcessTerminationStatus)
 
     explicit QWebEnginePage(QObject *parent = Q_NULLPTR);
     QWebEnginePage(QWebEngineProfile *profile, QObject *parent = Q_NULLPTR);
diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/webenginewidgets/api/qwebengineprofile.cpp
index 886a7207e..abed066d3 100644
--- a/src/webenginewidgets/api/qwebengineprofile.cpp
+++ b/src/webenginewidgets/api/qwebengineprofile.cpp
@@ -49,7 +49,7 @@
 
 #include "browser_context_adapter.h"
 #include <qtwebenginecoreglobal.h>
-#include "web_engine_visited_links_manager.h"
+#include "visited_links_manager_qt.h"
 #include "web_engine_settings.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/webenginewidgets/api/qwebengineprofile.h b/src/webenginewidgets/api/qwebengineprofile.h
index 1ce4bfe17..f9a564cd2 100644
--- a/src/webenginewidgets/api/qwebengineprofile.h
+++ b/src/webenginewidgets/api/qwebengineprofile.h
@@ -72,12 +72,14 @@ public:
         DiskHttpCache,
         NoCache
     };
+    Q_ENUM(HttpCacheType)
 
     enum PersistentCookiesPolicy {
         NoPersistentCookies,
         AllowPersistentCookies,
         ForcePersistentCookies
     };
+    Q_ENUM(PersistentCookiesPolicy)
 
     QString storageName() const;
     bool isOffTheRecord() const;
diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h
index ef3bf1f00..487cc2316 100644
--- a/src/webenginewidgets/api/qwebengineview.h
+++ b/src/webenginewidgets/api/qwebengineview.h
@@ -57,12 +57,12 @@ class QWebEngineViewPrivate;
 
 class QWEBENGINEWIDGETS_EXPORT QWebEngineView : public QWidget {
     Q_OBJECT
-    Q_PROPERTY(QString title READ title CONSTANT)
+    Q_PROPERTY(QString title READ title)
     Q_PROPERTY(QUrl url READ url WRITE setUrl)
     Q_PROPERTY(QUrl iconUrl READ iconUrl NOTIFY iconUrlChanged)
     Q_PROPERTY(QIcon icon READ icon NOTIFY iconChanged)
-    Q_PROPERTY(QString selectedText READ selectedText CONSTANT)
-    Q_PROPERTY(bool hasSelection READ hasSelection CONSTANT)
+    Q_PROPERTY(QString selectedText READ selectedText)
+    Q_PROPERTY(bool hasSelection READ hasSelection)
     Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor)
 
 public: