diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 12:12:45 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 12:19:40 +0100 |
| commit | 44e3a9d321190f2958e1a1bdfa7f840e56355279 (patch) | |
| tree | 4d167e9d0cfcb59eb6e2dd5ed4f55981627e9339 /tests/auto/compositor/compositor/testcompositor.h | |
| parent | e26696524ceb58f4fe0cb7202d873240b6a9478d (diff) | |
| parent | f72d63866d3f5820865fcd309b649dc9932518ee (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
examples/wayland/custom-extension/client-common/main.cpp
src/client/qwaylandwlshellintegration_p.h
src/client/qwaylandxdgshellintegration_p.h
src/compositor/compositor_api/qwaylandquickoutput.h
src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h
Change-Id: Ic78c610ddf102b0a185294f625bbfcb9238b0f3c
Diffstat (limited to 'tests/auto/compositor/compositor/testcompositor.h')
| -rw-r--r-- | tests/auto/compositor/compositor/testcompositor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/compositor/compositor/testcompositor.h b/tests/auto/compositor/compositor/testcompositor.h index 8eeb7ade6..d80fe3588 100644 --- a/tests/auto/compositor/compositor/testcompositor.h +++ b/tests/auto/compositor/compositor/testcompositor.h @@ -43,8 +43,8 @@ public slots: void onSurfaceAboutToBeDestroyed(QWaylandSurface *surface); protected: - QWaylandSeat *createSeat() Q_DECL_OVERRIDE; - QWaylandKeyboard *createKeyboardDevice(QWaylandSeat *seat) Q_DECL_OVERRIDE; + QWaylandSeat *createSeat() override; + QWaylandKeyboard *createKeyboardDevice(QWaylandSeat *seat) override; public: QList<QWaylandSurface *> surfaces; |