diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2016-07-11 11:38:50 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2016-07-13 08:46:16 +0000 |
| commit | a172672484b9496819e588b51ac2ff9fb4a21941 (patch) | |
| tree | ff5f2399be8b68b25d5c5c4162383d70b4ce04de /src | |
| parent | f15c3606672001b4582b42883a90b9bf260d867d (diff) | |
Fix clang compilation errors
Adds missing overrides and removes a private header generated by
wayland-scanner from the public API.
Change-Id: I53fc3f8bacca41821f0531aae02ca2a5da758e13
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/global/qwaylandclientextension.h | 4 | ||||
| -rw-r--r-- | src/compositor/extensions/qwaylandwlshell.h | 2 | ||||
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgshell.h | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/client/global/qwaylandclientextension.h b/src/client/global/qwaylandclientextension.h index 9ff45ea00..afb3f868f 100644 --- a/src/client/global/qwaylandclientextension.h +++ b/src/client/global/qwaylandclientextension.h @@ -39,7 +39,9 @@ #include <QObject> #include <QtWaylandClient/qwaylandclientexport.h> -#include <QtWaylandClient/private/qwayland-wayland.h> + +struct wl_registry; + QT_BEGIN_NAMESPACE namespace QtWaylandClient { diff --git a/src/compositor/extensions/qwaylandwlshell.h b/src/compositor/extensions/qwaylandwlshell.h index 441c5452b..5bddd4f7b 100644 --- a/src/compositor/extensions/qwaylandwlshell.h +++ b/src/compositor/extensions/qwaylandwlshell.h @@ -152,7 +152,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 c01726ac6..c11ca1f3a 100644 --- a/src/compositor/extensions/qwaylandxdgshell.h +++ b/src/compositor/extensions/qwaylandxdgshell.h @@ -185,7 +185,7 @@ Q_SIGNALS: void ackConfigure(uint serial); private: - void initialize(); + void initialize() override; QList<int> statesAsInts() const; private Q_SLOTS: @@ -221,7 +221,7 @@ Q_SIGNALS: void parentSurfaceChanged(); private: - void initialize(); + void initialize() override; }; QT_END_NAMESPACE |