From 7b6f30c13717654ec3b95e67edde88a03da45e22 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 14 Aug 2020 15:07:29 +0200 Subject: Fix suggest-override warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also violates modern Qt code style Change-Id: Ibb12b6db18bbd2669377abe1d25034ed69a86389 Reviewed-by: Jüri Valdmann --- src/webengine/api/qquickwebenginefaviconprovider_p_p.h | 2 +- src/webengine/api/qquickwebenginehistory_p.h | 6 +++--- src/webengine/api/qquickwebenginetestsupport_p.h | 6 +++--- src/webengine/api/qquickwebenginetouchhandleprovider_p_p.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/webengine/api') diff --git a/src/webengine/api/qquickwebenginefaviconprovider_p_p.h b/src/webengine/api/qquickwebenginefaviconprovider_p_p.h index 18b6d61c8..4ccc4ba10 100644 --- a/src/webengine/api/qquickwebenginefaviconprovider_p_p.h +++ b/src/webengine/api/qquickwebenginefaviconprovider_p_p.h @@ -72,7 +72,7 @@ public: void detach(QQuickWebEngineView *); - virtual QPixmap requestPixmap(const QString &, QSize *, const QSize &); + QPixmap requestPixmap(const QString &, QSize *, const QSize &) override; private: QQuickWebEngineView *viewForIconUrl(const QUrl &) const; diff --git a/src/webengine/api/qquickwebenginehistory_p.h b/src/webengine/api/qquickwebenginehistory_p.h index 5d4783e96..db0be3bad 100644 --- a/src/webengine/api/qquickwebenginehistory_p.h +++ b/src/webengine/api/qquickwebenginehistory_p.h @@ -73,9 +73,9 @@ public: QQuickWebEngineHistoryListModel(QQuickWebEngineHistoryListModelPrivate*); virtual ~QQuickWebEngineHistoryListModel(); - int rowCount(const QModelIndex& parent = QModelIndex()) const; - QVariant data(const QModelIndex& index, int role) const; - QHash roleNames() const; + int rowCount(const QModelIndex& parent = QModelIndex()) const override; + QVariant data(const QModelIndex& index, int role) const override; + QHash roleNames() const override; void reset(); private: diff --git a/src/webengine/api/qquickwebenginetestsupport_p.h b/src/webengine/api/qquickwebenginetestsupport_p.h index 30e6ee5c4..89a997b29 100644 --- a/src/webengine/api/qquickwebenginetestsupport_p.h +++ b/src/webengine/api/qquickwebenginetestsupport_p.h @@ -86,9 +86,9 @@ public: Q_INVOKABLE void create(); Q_INVOKABLE void release(); - virtual void showInputPanel(); - virtual void hideInputPanel(); - virtual bool isInputPanelVisible() const; + void showInputPanel() override; + void hideInputPanel() override; + bool isInputPanelVisible() const override; private: bool m_visible; diff --git a/src/webengine/api/qquickwebenginetouchhandleprovider_p_p.h b/src/webengine/api/qquickwebenginetouchhandleprovider_p_p.h index 277436289..5379a5729 100644 --- a/src/webengine/api/qquickwebenginetouchhandleprovider_p_p.h +++ b/src/webengine/api/qquickwebenginetouchhandleprovider_p_p.h @@ -65,7 +65,7 @@ public: ~QQuickWebEngineTouchHandleProvider(); void init(const QMap &images); - virtual QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize); + QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) override; private: QMap m_touchHandleMap; -- cgit v1.2.1 From 6deddc5ecd6155c567aecd0338c53c63fa465bfd Mon Sep 17 00:00:00 2001 From: Tamas Zakor Date: Wed, 8 Jul 2020 14:50:14 +0200 Subject: Ignore QQuickWebEngineNewViewRequest if it is unhandled This is the case when the WebEngineNewViewRequest.openIn() is not called on newViewRequested(). For example, when opening the view source from context menu in quick minimal example. Fixes: QTBUG-85494 Change-Id: I7c1ae53684361de459b2f268e471904e632821b0 Reviewed-by: Allan Sandfeld Jensen --- src/webengine/api/qquickwebenginenewviewrequest.cpp | 1 + src/webengine/api/qquickwebenginenewviewrequest_p.h | 1 + src/webengine/api/qquickwebengineview.cpp | 4 ++++ 3 files changed, 6 insertions(+) (limited to 'src/webengine/api') diff --git a/src/webengine/api/qquickwebenginenewviewrequest.cpp b/src/webengine/api/qquickwebenginenewviewrequest.cpp index 0af943de8..78ae1622a 100644 --- a/src/webengine/api/qquickwebenginenewviewrequest.cpp +++ b/src/webengine/api/qquickwebenginenewviewrequest.cpp @@ -117,5 +117,6 @@ void QQuickWebEngineNewViewRequest::openIn(QQuickWebEngineView *view) view->d_func()->adoptWebContents(m_adapter.data()); else view->setUrl(m_requestedUrl); + m_isRequestHandled = true; m_adapter.reset(); } diff --git a/src/webengine/api/qquickwebenginenewviewrequest_p.h b/src/webengine/api/qquickwebenginenewviewrequest_p.h index e21f76111..d4686b291 100644 --- a/src/webengine/api/qquickwebenginenewviewrequest_p.h +++ b/src/webengine/api/qquickwebenginenewviewrequest_p.h @@ -77,6 +77,7 @@ private: QQuickWebEngineNewViewRequest(); QQuickWebEngineView::NewViewDestination m_destination; bool m_isUserInitiated; + bool m_isRequestHandled = false; QSharedPointer m_adapter; QUrl m_requestedUrl; friend class QQuickWebEngineView; diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index aeb202c6a..7b875bf55 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -554,6 +554,7 @@ QQuickWebEngineViewPrivate::adoptNewWindow(QSharedPointer ne const QRect &, const QUrl &targetUrl) { Q_Q(QQuickWebEngineView); + Q_ASSERT(newWebContents); QQuickWebEngineNewViewRequest request; request.m_adapter = newWebContents; request.m_isUserInitiated = userGesture; @@ -578,6 +579,9 @@ QQuickWebEngineViewPrivate::adoptNewWindow(QSharedPointer ne Q_EMIT q->newViewRequested(&request); + if (!request.m_isRequestHandled) + return nullptr; + return newWebContents; } -- cgit v1.2.1