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

Includes sha1 bump of src/3rdparty to head of 58-based.

Change-Id: I37743c3979c1b6fb21f71eab7048e82f7aa5d78b

1 files changed, 8 insertions, 10 deletions

diff --git a/examples/webenginewidgets/simplebrowser/browserwindow.h b/examples/webenginewidgets/simplebrowser/browserwindow.h
index 03c8d385b..745061691 100644
--- a/examples/webenginewidgets/simplebrowser/browserwindow.h
+++ b/examples/webenginewidgets/simplebrowser/browserwindow.h
@@ -42,14 +42,16 @@
 #define BROWSERWINDOW_H
 
 #include <QMainWindow>
+#include <QTime>
 #include <QWebEnginePage>
 
 QT_BEGIN_NAMESPACE
+class QLineEdit;
 class QProgressBar;
 QT_END_NAMESPACE
 
+class Browser;
 class TabWidget;
-class UrlLineEdit;
 class WebView;
 
 class BrowserWindow : public QMainWindow
@@ -57,15 +59,11 @@ class BrowserWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    BrowserWindow(QWidget *parent = nullptr, Qt::WindowFlags flags = 0);
-    ~BrowserWindow();
+    BrowserWindow(Browser *browser);
     QSize sizeHint() const override;
     TabWidget *tabWidget() const;
     WebView *currentTab() const;
-
-    void loadPage(const QString &url);
-    void loadPage(const QUrl &url);
-    void loadHomePage();
+    Browser *browser() { return m_browser; }
 
 protected:
     void closeEvent(QCloseEvent *event) override;
@@ -77,8 +75,6 @@ private slots:
     void handleShowWindowTriggered();
     void handleWebViewLoadProgress(int);
     void handleWebViewTitleChanged(const QString &title);
-    void handleWebViewUrlChanged(const QUrl &url);
-    void handleWebViewIconChanged(const QIcon &icon);
     void handleWebActionEnabledChanged(QWebEnginePage::WebAction action, bool enabled);
 
 private:
@@ -90,6 +86,7 @@ private:
     QToolBar *createToolBar();
 
 private:
+    Browser *m_browser;
     TabWidget *m_tabWidget;
     QProgressBar *m_progressBar;
     QAction *m_historyBackAction;
@@ -97,7 +94,8 @@ private:
     QAction *m_stopAction;
     QAction *m_reloadAction;
     QAction *m_stopReloadAction;
-    UrlLineEdit *m_urlLineEdit;
+    QLineEdit *m_urlLineEdit;
+    QAction *m_favAction;
     QString m_lastSearch;
 };