diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-02 11:42:23 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-03 08:27:50 +0000 |
commit | ded7536c90023fdf5f643a180ced405643ba7ab5 (patch) | |
tree | 9f854dc596a583bf8ae11818109bf6784314083f /tests/auto/quick | |
parent | 0828a05dfbc3babb8719b984145027f677ce9686 (diff) |
Remove our last uses of Q_DECL_OVERRIDE and Q_NULLPTR
Change-Id: I8806a3fb466006f14cf92f17510cdea8b50e8345
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'tests/auto/quick')
-rw-r--r-- | tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp | 2 | ||||
-rw-r--r-- | tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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(); } |