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 /examples/wayland/custom-extension | |
| 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 'examples/wayland/custom-extension')
3 files changed, 10 insertions, 10 deletions
diff --git a/examples/wayland/custom-extension/client-common/customextension.h b/examples/wayland/custom-extension/client-common/customextension.h index 3b64fc646..9f7fac782 100644 --- a/examples/wayland/custom-extension/client-common/customextension.h +++ b/examples/wayland/custom-extension/client-common/customextension.h @@ -69,11 +69,11 @@ private slots: void handleExtensionActive(); private: - void example_extension_close(wl_surface *surface) Q_DECL_OVERRIDE; - void example_extension_set_font_size(wl_surface *surface, uint32_t pixel_size) Q_DECL_OVERRIDE; - void example_extension_set_window_decoration(uint32_t state) Q_DECL_OVERRIDE; + void example_extension_close(wl_surface *surface) override; + void example_extension_set_font_size(wl_surface *surface, uint32_t pixel_size) override; + void example_extension_set_window_decoration(uint32_t state) override; - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *event) override; QWindow *windowForSurface(struct ::wl_surface *); void sendWindowRegistration(QWindow *); diff --git a/examples/wayland/custom-extension/compositor/customextension.h b/examples/wayland/custom-extension/compositor/customextension.h index b1b00408b..7f09ad0eb 100644 --- a/examples/wayland/custom-extension/compositor/customextension.h +++ b/examples/wayland/custom-extension/compositor/customextension.h @@ -54,7 +54,7 @@ class CustomExtension : public QWaylandCompositorExtensionTemplate<CustomExtens Q_OBJECT public: CustomExtension(QWaylandCompositor *compositor = 0); - void initialize() Q_DECL_OVERRIDE; + void initialize() override; signals: void surfaceAdded(QWaylandSurface *surface); @@ -67,9 +67,9 @@ public slots: void close(QWaylandSurface *surface); protected: - void example_extension_bounce(Resource *resource, wl_resource *surface, uint32_t duration) Q_DECL_OVERRIDE; - void example_extension_spin(Resource *resource, wl_resource *surface, uint32_t duration) Q_DECL_OVERRIDE; - void example_extension_register_surface(Resource *resource, wl_resource *surface) Q_DECL_OVERRIDE; + void example_extension_bounce(Resource *resource, wl_resource *surface, uint32_t duration) override; + void example_extension_spin(Resource *resource, wl_resource *surface, uint32_t duration) override; + void example_extension_register_surface(Resource *resource, wl_resource *surface) override; }; Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(CustomExtension) diff --git a/examples/wayland/custom-extension/cpp-client/main.cpp b/examples/wayland/custom-extension/cpp-client/main.cpp index af8de53b5..3dbada171 100644 --- a/examples/wayland/custom-extension/cpp-client/main.cpp +++ b/examples/wayland/custom-extension/cpp-client/main.cpp @@ -100,7 +100,7 @@ public slots: } protected: - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE + void paintEvent(QPaintEvent *) override { QPainter p(this); p.setFont(m_font); @@ -113,7 +113,7 @@ protected: p.drawText(rect3, Qt::TextWordWrap, "Create new window."); } - void mousePressEvent(QMouseEvent *ev) Q_DECL_OVERRIDE + void mousePressEvent(QMouseEvent *ev) override { if (rect1.contains(ev->pos())) doSpin(); |