From ded7536c90023fdf5f643a180ced405643ba7ab5 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 2 Apr 2019 11:42:23 +0200 Subject: Remove our last uses of Q_DECL_OVERRIDE and Q_NULLPTR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8806a3fb466006f14cf92f17510cdea8b50e8345 Reviewed-by: Jüri Valdmann --- tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp | 2 +- .../qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/quick') diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp index eb76be6db..74c04635f 100644 --- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp +++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp @@ -878,7 +878,7 @@ public: setAcceptHoverEvents(true); } - bool event(QEvent *event) Q_DECL_OVERRIDE + bool event(QEvent *event) override { switch (event->type()) { case QEvent::TabletPress: diff --git a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp index 2b9742b99..b587f3b27 100644 --- a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp +++ b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp @@ -46,7 +46,7 @@ public: Qt::QueuedConnection); } - virtual void exposeEvent(QExposeEvent *e) Q_DECL_OVERRIDE { + virtual void exposeEvent(QExposeEvent *e) override { QQuickView::exposeEvent(e); emit _q_exposeChanged(); } -- cgit v1.2.3