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/widgets/qwebengineview | |
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/widgets/qwebengineview')
-rw-r--r-- | tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp index 17177c7fb..16a3d32b6 100644 --- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp +++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp @@ -588,8 +588,8 @@ class KeyEventRecordingWidget : public QWidget { public: QList<QKeyEvent> pressEvents; QList<QKeyEvent> releaseEvents; - void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE { pressEvents << *e; } - void keyReleaseEvent(QKeyEvent *e) Q_DECL_OVERRIDE { releaseEvents << *e; } + void keyPressEvent(QKeyEvent *e) override { pressEvents << *e; } + void keyReleaseEvent(QKeyEvent *e) override { releaseEvents << *e; } }; void tst_QWebEngineView::unhandledKeyEventPropagation() @@ -879,7 +879,7 @@ public: explicit KeyboardAndMouseEventRecordingWidget(QWidget *parent = 0) : QWidget(parent), m_eventCounter(0) {} - bool event(QEvent *event) Q_DECL_OVERRIDE + bool event(QEvent *event) override { QString eventString; switch (event->type()) { |