From 6c4f89e047b933e53c50bcd56ba738c34b753f8e Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 1 Feb 2023 14:24:30 +0100 Subject: 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 (cherry picked from commit decc4fb68dfb449e82dc0219365c95c130ede36f) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h | 1 - src/plugins/shellintegration/qt-shell/qwaylandqtsurface_p.h | 1 - 2 files changed, 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 -- cgit v1.2.1