diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-01 20:44:33 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-01 20:44:34 +0100 |
| commit | ee58fc0edc94d18c2ab6d30f1836b23606ab2195 (patch) | |
| tree | ab6a8ff67ebee6de5ad36f45970376790ea5c30d /src/compositor/extensions/qwaylandivisurface.h | |
| parent | 4060e1416d0340b6c31ee193db6be3ce8083a4cd (diff) | |
| parent | 44e3a9d321190f2958e1a1bdfa7f840e56355279 (diff) | |
Merge dev into 5.9
Change-Id: I560f73aa89f2b833a405861bef510aad8fbd9a07
Diffstat (limited to 'src/compositor/extensions/qwaylandivisurface.h')
| -rw-r--r-- | src/compositor/extensions/qwaylandivisurface.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/extensions/qwaylandivisurface.h b/src/compositor/extensions/qwaylandivisurface.h index 4e11493fc..e362eecb9 100644 --- a/src/compositor/extensions/qwaylandivisurface.h +++ b/src/compositor/extensions/qwaylandivisurface.h @@ -74,7 +74,7 @@ public: Q_INVOKABLE void sendConfigure(const QSize &size); #ifdef QT_WAYLAND_COMPOSITOR_QUICK - QWaylandQuickShellIntegration *createIntegration(QWaylandQuickShellSurfaceItem *item) Q_DECL_OVERRIDE; + QWaylandQuickShellIntegration *createIntegration(QWaylandQuickShellSurfaceItem *item) override; #endif Q_SIGNALS: @@ -82,7 +82,7 @@ Q_SIGNALS: void iviIdChanged(); private: - void initialize() Q_DECL_OVERRIDE; + void initialize() override; }; QT_END_NAMESPACE |