diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:44:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:44:58 +0200 |
| commit | a4d68e7d78a28225c23931431f0db6ebf75f5e41 (patch) | |
| tree | ea04abea84bfa53aa4212cade81df780f4a5d89b /src/compositor/extensions | |
| parent | 5ce1c2a3bf9546171d2913c76330bc6d1b6a4789 (diff) | |
| parent | 6260c4376e598031e467416027703bd11012621d (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
examples/wayland/minimal-qml/main.qml
Change-Id: Ic34029a6aa77f2b359f40258a05421d82efd5b37
Diffstat (limited to 'src/compositor/extensions')
| -rw-r--r-- | src/compositor/extensions/qwaylandwlshell.h | 2 | ||||
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgshell.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor/extensions/qwaylandwlshell.h b/src/compositor/extensions/qwaylandwlshell.h index 38d87a8c7..ce6ca895c 100644 --- a/src/compositor/extensions/qwaylandwlshell.h +++ b/src/compositor/extensions/qwaylandwlshell.h @@ -160,7 +160,7 @@ Q_SIGNALS: void setMaximized(QWaylandOutput *output); private: - void initialize(); + void initialize() override; }; QT_END_NAMESPACE diff --git a/src/compositor/extensions/qwaylandxdgshell.h b/src/compositor/extensions/qwaylandxdgshell.h index 263633dcc..af198989d 100644 --- a/src/compositor/extensions/qwaylandxdgshell.h +++ b/src/compositor/extensions/qwaylandxdgshell.h @@ -189,7 +189,7 @@ Q_SIGNALS: void ackConfigure(uint serial); private: - void initialize(); + void initialize() override; QList<int> statesAsInts() const; private Q_SLOTS: @@ -233,7 +233,7 @@ Q_SIGNALS: void parentSurfaceChanged(); private: - void initialize(); + void initialize() override; }; QT_END_NAMESPACE |