Merge branch '5.6' into dev

Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78

1 files changed, 7 insertions, 1 deletions

diff --git a/examples/webenginewidgets/demobrowser/tabwidget.h b/examples/webenginewidgets/demobrowser/tabwidget.h
index f4ad9c02d..c6eef58f9 100644
--- a/examples/webenginewidgets/demobrowser/tabwidget.h
+++ b/examples/webenginewidgets/demobrowser/tabwidget.h
@@ -131,13 +131,16 @@ private:
 
 #include <QtCore/QUrl>
 #include <QtWidgets/QTabWidget>
-QT_BEGIN_NAMESPACE
+
 class FullScreenNotification;
+
+QT_BEGIN_NAMESPACE
 class QCompleter;
 class QLineEdit;
 class QMenu;
 class QStackedWidget;
 QT_END_NAMESPACE
+
 /*!
     TabWidget that contains WebViews and a stack widget of associated line edits.
 
@@ -222,9 +225,12 @@ private slots:
     void windowCloseRequested();
     void moveTab(int fromIndex, int toIndex);
     void fullScreenRequested(QWebEngineFullScreenRequest request);
+    void handleTabBarDoubleClicked(int index);
     void webPageMutedOrAudibleChanged();
 
 private:
+    void setupPage(QWebEnginePage* page);
+
     QAction *m_recentlyClosedTabsAction;
     QAction *m_newTabAction;
     QAction *m_closeTabAction;