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 /src/client/qwaylandwlshellintegration_p.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 'src/client/qwaylandwlshellintegration_p.h')
| -rw-r--r-- | src/client/qwaylandwlshellintegration_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/qwaylandwlshellintegration_p.h b/src/client/qwaylandwlshellintegration_p.h index 393ccaf0a..8a33a177c 100644 --- a/src/client/qwaylandwlshellintegration_p.h +++ b/src/client/qwaylandwlshellintegration_p.h @@ -58,8 +58,8 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandWlShellIntegration : public QWaylandShellI { public: static QWaylandWlShellIntegration *create(QWaylandDisplay* display); - bool initialize(QWaylandDisplay *) Q_DECL_OVERRIDE; - QWaylandShellSurface *createShellSurface(QWaylandWindow *window) Q_DECL_OVERRIDE; + bool initialize(QWaylandDisplay *) override; + QWaylandShellSurface *createShellSurface(QWaylandWindow *window) override; private: QWaylandWlShellIntegration(QWaylandDisplay* display); |