diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-06 09:46:51 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-11-06 14:25:20 +0000 |
| commit | 8e860f836bce8fd70a90798f8817a1410d8d8414 (patch) | |
| tree | 9cd4ddc95f3f1e46fd66ee2ddef2d264cac019e1 /tests/auto/gui | |
| parent | 1a0b4b9f26e16532cc3d5532e25d886426ce994e (diff) | |
| parent | a7e4b645dc5b164eb31c22b558ae7a2f5b674afb (diff) | |
Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/gui')
| -rw-r--r-- | tests/auto/gui/kernel/noqteventloop/tst_noqteventloop.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/gui/kernel/noqteventloop/tst_noqteventloop.cpp b/tests/auto/gui/kernel/noqteventloop/tst_noqteventloop.cpp index 37d97cd3db..4fca9a07fc 100644 --- a/tests/auto/gui/kernel/noqteventloop/tst_noqteventloop.cpp +++ b/tests/auto/gui/kernel/noqteventloop/tst_noqteventloop.cpp @@ -64,7 +64,7 @@ public: m_received.clear(); } - bool event(QEvent *event) + bool event(QEvent *event) override { m_received[event->type()]++; return QWindow::event(event); |