Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I329397621f19ba3890be5daf44a6bb2d668ad2d8

5 files changed, 7 insertions, 20 deletions

diff --git a/examples/webenginewidgets/demobrowser/history.cpp b/examples/webenginewidgets/demobrowser/history.cpp
index 32100e543..aaab44ac8 100644
--- a/examples/webenginewidgets/demobrowser/history.cpp
+++ b/examples/webenginewidgets/demobrowser/history.cpp
@@ -226,9 +226,9 @@ void HistoryManager::clear()
 {
     m_history.clear();
     m_lastSavedUrl = QString();
+    emit historyReset();
     m_saveTimer->changeOccurred();
     m_saveTimer->saveIfNeccessary();
-    historyReset();
 }
 
 void HistoryManager::loadSettings()
diff --git a/examples/webenginewidgets/demobrowser/urllineedit.cpp b/examples/webenginewidgets/demobrowser/urllineedit.cpp
index e56ab63a5..8203e4f0f 100644
--- a/examples/webenginewidgets/demobrowser/urllineedit.cpp
+++ b/examples/webenginewidgets/demobrowser/urllineedit.cpp
@@ -338,7 +338,7 @@ void UrlLineEdit::paintEvent(QPaintEvent *event)
         QColor loadingColor = QColor(116, 192, 250);
         painter.setBrush(generateGradient(loadingColor));
         painter.setPen(Qt::transparent);
-        int mid = backgroundRect.width() / 100 * progress;
+        int mid = backgroundRect.width() / 100.0f * progress;
         QRect progressRect(backgroundRect.x(), backgroundRect.y(), mid, backgroundRect.height());
         painter.drawRect(progressRect);
     }
diff --git a/examples/webenginewidgets/demobrowser/webview.cpp b/examples/webenginewidgets/demobrowser/webview.cpp
index 192df6836..633b72bf1 100644
--- a/examples/webenginewidgets/demobrowser/webview.cpp
+++ b/examples/webenginewidgets/demobrowser/webview.cpp
@@ -104,16 +104,6 @@ BrowserMainWindow *WebPage::mainWindow()
     return BrowserApplication::instance()->mainWindow();
 }
 
-bool WebPage::acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame)
-{
-    Q_UNUSED(type);
-    if (isMainFrame) {
-        m_loadingUrl = url;
-        emit loadingUrl(m_loadingUrl);
-    }
-    return true;
-}
-
 bool WebPage::certificateError(const QWebEngineCertificateError &error)
 {
     if (error.isOverridable()) {
@@ -385,6 +375,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
     }
     if (page()->contextMenuData().selectedText().isEmpty())
         menu->addAction(page()->action(QWebEnginePage::SavePage));
+    connect(menu, &QMenu::aboutToHide, menu, &QObject::deleteLater);
     menu->popup(event->globalPos());
 }
 
diff --git a/examples/webenginewidgets/demobrowser/webview.h b/examples/webenginewidgets/demobrowser/webview.h
index a931d3702..e3df8f795 100644
--- a/examples/webenginewidgets/demobrowser/webview.h
+++ b/examples/webenginewidgets/demobrowser/webview.h
@@ -65,16 +65,11 @@ QT_END_NAMESPACE
 class BrowserMainWindow;
 class WebPage : public QWebEnginePage {
     Q_OBJECT
-
-signals:
-    void loadingUrl(const QUrl &url);
-
 public:
     WebPage(QWebEngineProfile *profile, QObject *parent = 0);
     BrowserMainWindow *mainWindow();
 
 protected:
-    bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame) Q_DECL_OVERRIDE;
     QWebEnginePage *createWindow(QWebEnginePage::WebWindowType type) Q_DECL_OVERRIDE;
 #if !defined(QT_NO_UITOOLS)
     QObject *createPlugin(const QString &classId, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues);
@@ -94,7 +89,6 @@ private:
     // set the webview mousepressedevent
     Qt::KeyboardModifiers m_keyboardModifiers;
     Qt::MouseButtons m_pressedButtons;
-    QUrl m_loadingUrl;
 };
 
 class WebView : public QWebEngineView {
diff --git a/examples/webenginewidgets/simplebrowser/webview.cpp b/examples/webenginewidgets/simplebrowser/webview.cpp
index d92545620..24835b10b 100644
--- a/examples/webenginewidgets/simplebrowser/webview.cpp
+++ b/examples/webenginewidgets/simplebrowser/webview.cpp
@@ -143,9 +143,11 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
     if (it != actions.cend()) {
         (*it)->setText(tr("Open Link in This Tab"));
         ++it;
-        menu->insertAction(*it, page()->action(QWebEnginePage::OpenLinkInNewWindow));
-        menu->insertAction(*it, page()->action(QWebEnginePage::OpenLinkInNewTab));
+        QAction *before(it == actions.cend() ? nullptr : *it);
+        menu->insertAction(before, page()->action(QWebEnginePage::OpenLinkInNewWindow));
+        menu->insertAction(before, page()->action(QWebEnginePage::OpenLinkInNewTab));
     }
+    connect(menu, &QMenu::aboutToHide, menu, &QObject::deleteLater);
     menu->popup(event->globalPos());
 }