diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-01 14:24:30 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-13 08:48:16 +0000 |
| commit | 6c4f89e047b933e53c50bcd56ba738c34b753f8e (patch) | |
| tree | 89d58fa165facf648daf5cdc5d2c934a924b15b6 | |
| parent | 7d339afdb919da3978ef92094f831fd06ea64250 (diff) | |
| download | qtwayland-6c4f89e047b933e53c50bcd56ba738c34b753f8e.tar.gz | |
Remove QWindow forward declarations in namespaces
They cause clashes in CMake Unity (Jumbo) builds.
Task-number: QTBUG-109394
Change-Id: Idc0d0baeef4b92f61ed67d9a850b5ad3422f9146
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit decc4fb68dfb449e82dc0219365c95c130ede36f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h | 1 | ||||
| -rw-r--r-- | src/plugins/shellintegration/qt-shell/qwaylandqtsurface_p.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h index 853897cd..fc97a835 100644 --- a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h +++ b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h @@ -14,7 +14,6 @@ namespace QtWaylandClient { class QWaylandWindow; class QWaylandInputDevice; -class QWindow; class QWaylandExtendedSurface; class Q_WAYLANDCLIENT_EXPORT QWaylandIviSurface : public QtWayland::ivi_surface diff --git a/src/plugins/shellintegration/qt-shell/qwaylandqtsurface_p.h b/src/plugins/shellintegration/qt-shell/qwaylandqtsurface_p.h index 53c37f79..6431bd55 100644 --- a/src/plugins/shellintegration/qt-shell/qwaylandqtsurface_p.h +++ b/src/plugins/shellintegration/qt-shell/qwaylandqtsurface_p.h @@ -14,7 +14,6 @@ namespace QtWaylandClient { class QWaylandWindow; class QWaylandInputDevice; -class QWindow; class Q_WAYLANDCLIENT_EXPORT QWaylandQtSurface : public QWaylandShellSurface , public QtWayland::zqt_shell_surface_v1 |