Merge branch '5.5' into 5.6

Change-Id: I9977663123560a22f493b8c02d02de8897b38666

3 files changed, 5 insertions, 32 deletions

diff --git a/examples/webenginewidgets/browser/history.cpp b/examples/webenginewidgets/browser/history.cpp
index d9d76cd29..ce104e982 100644
--- a/examples/webenginewidgets/browser/history.cpp
+++ b/examples/webenginewidgets/browser/history.cpp
@@ -59,9 +59,6 @@
 #include <QtWidgets/QHeaderView>
 #include <QtWidgets/QStyle>
 
-#if defined(QWEBENGINEHISTORYINTERFACE)
-#include <QWebEngineHistoryInterface>
-#endif
 #include <QWebEngineSettings>
 
 #include <QtCore/QDebug>
@@ -69,11 +66,8 @@
 static const unsigned int HISTORY_VERSION = 23;
 
 HistoryManager::HistoryManager(QObject *parent)
-    :
-#if defined(QWEBENGINEHISTORYINTERFACE)
-      QWebEngineHistoryInterface(parent),
-#endif
-      m_saveTimer(new AutoSaver(this))
+    : QObject(parent)
+    , m_saveTimer(new AutoSaver(this))
     , m_historyLimit(30)
     , m_historyModel(0)
     , m_historyFilterModel(0)
@@ -91,13 +85,6 @@ HistoryManager::HistoryManager(QObject *parent)
     m_historyModel = new HistoryModel(this, this);
     m_historyFilterModel = new HistoryFilterModel(m_historyModel, this);
     m_historyTreeModel = new HistoryTreeModel(m_historyFilterModel, this);
-
-#if defined(QWEBENGINEHISTORYINTERFACE)
-    // QWebEngineHistoryInterface will delete the history manager
-    QWebEngineHistoryInterface::setDefaultInterface(this);
-#else
-    Q_UNUSED(parent);
-#endif
 }
 
 HistoryManager::~HistoryManager()
diff --git a/examples/webenginewidgets/browser/history.h b/examples/webenginewidgets/browser/history.h
index 3519d31b6..bcb9c9b28 100644
--- a/examples/webenginewidgets/browser/history.h
+++ b/examples/webenginewidgets/browser/history.h
@@ -52,10 +52,6 @@
 
 #include <QtCore/QSortFilterProxyModel>
 
-#if defined(QWEBENGINEHISTORYINTERFACE)
-#include <QWebEngineHistoryInterface>
-#endif
-
 class HistoryItem
 {
 public:
@@ -82,12 +78,7 @@ class HistoryModel;
 class HistoryFilterModel;
 class HistoryTreeModel;
 
-class HistoryManager
-#if defined(QWEBENGINEHISTORYINTERFACE)
- : public QWebEngineHistoryInterface
-#else
- : public QObject
-#endif
+class HistoryManager : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int historyLimit READ historyLimit WRITE setHistoryLimit)
diff --git a/examples/webenginewidgets/browser/tabwidget.cpp b/examples/webenginewidgets/browser/tabwidget.cpp
index 3df1628e0..c093b804a 100644
--- a/examples/webenginewidgets/browser/tabwidget.cpp
+++ b/examples/webenginewidgets/browser/tabwidget.cpp
@@ -73,11 +73,8 @@ TabBar::TabBar(QWidget *parent)
             this, SLOT(contextMenuRequested(QPoint)));
 
     QString ctrl = QLatin1String("Ctrl+%1");
-    for (int i = 1; i <= 10; ++i) {
-        int key = i;
-        if (key == 10)
-            key = 0;
-        QShortcut *shortCut = new QShortcut(ctrl.arg(key), this);
+    for (int i = 1; i < 10; ++i) {
+        QShortcut *shortCut = new QShortcut(ctrl.arg(i), this);
         m_tabShortcuts.append(shortCut);
         connect(shortCut, SIGNAL(activated()), this, SLOT(selectTabAction()));
     }
@@ -92,8 +89,6 @@ void TabBar::selectTabAction()
 {
     if (QShortcut *shortCut = qobject_cast<QShortcut*>(sender())) {
         int index = m_tabShortcuts.indexOf(shortCut);
-        if (index == 0)
-            index = 10;
         setCurrentIndex(index);
     }
 }