diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-12-03 08:33:44 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-12-03 09:15:26 +0000 |
| commit | 5e6f3ba87e37e1acee900e34925f7d80966efc8b (patch) | |
| tree | adfcc9fa06bff3e31fd259e4560e8c796d874efd | |
| parent | afc730549d69f292d20437a70b52c34cae4481a6 (diff) | |
Move Q_DECLARE_PUBLIC to the public section
This is now required to use QObjectPrivate::connect.
Fixes: QTBUG-98897
Change-Id: Ibe98404c6e220da43cd08ab732821c874c39bc18
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit cb937aa14a3fc66d3da4bcf07075a7dd00977eb6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/compositor/compositor_api/qwaylandoutput_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandoutput_p.h b/src/compositor/compositor_api/qwaylandoutput_p.h index ac62b0102..e915df6d2 100644 --- a/src/compositor/compositor_api/qwaylandoutput_p.h +++ b/src/compositor/compositor_api/qwaylandoutput_p.h @@ -85,6 +85,8 @@ struct QWaylandSurfaceViewMapper class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandOutputPrivate : public QObjectPrivate, public QtWaylandServer::wl_output { public: + Q_DECLARE_PUBLIC(QWaylandOutput) + QWaylandOutputPrivate(); ~QWaylandOutputPrivate() override; @@ -128,7 +130,6 @@ private: bool initialized = false; QSize windowPixelSize; - Q_DECLARE_PUBLIC(QWaylandOutput) Q_DISABLE_COPY(QWaylandOutputPrivate) friend class QWaylandXdgOutputManagerV1Private; |