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, 3 insertions, 3 deletions

diff --git a/examples/webenginewidgets/simplebrowser/tabwidget.h b/examples/webenginewidgets/simplebrowser/tabwidget.h
index 830effa4e..e5a1671ae 100644
--- a/examples/webenginewidgets/simplebrowser/tabwidget.h
+++ b/examples/webenginewidgets/simplebrowser/tabwidget.h
@@ -56,7 +56,6 @@ class TabWidget : public QTabWidget
 
 public:
     TabWidget(QWidget *parent = nullptr);
-    ~TabWidget();
 
     WebView *currentWebView() const;
 
@@ -66,7 +65,7 @@ signals:
     void loadProgress(int progress);
     void titleChanged(const QString &title);
     void urlChanged(const QUrl &url);
-    void iconChanged(const QIcon &icon);
+    void favIconChanged(const QIcon &icon);
     void webActionEnabledChanged(QWebEnginePage::WebAction action, bool enabled);
 
 public slots:
@@ -74,7 +73,8 @@ public slots:
     void setUrl(const QUrl &url);
     void triggerWebPageAction(QWebEnginePage::WebAction action);
 
-    WebView *createTab(bool makeCurrent = true);
+    WebView *createTab();
+    WebView *createBackgroundTab();
     void closeTab(int index);
     void nextTab();
     void previousTab();