From 8fb0ceeb95539f2958cf5f89bcc6c4ee08460b7d Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Sun, 5 Jan 2025 12:05:38 +0100
Subject: [PATCH] QWaylandShellIntegration: pin vtable to a single TU

Fixes -Wweak-vtables, at least on the base class; the implementation
is a template, so can't be fixed.

Pick-to: 6.9
Change-Id: Ic697614995042e3e0cf130bbaf1bc21a891b497b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 .../wayland/shellintegration/qwaylandshellintegration.cpp      | 3 +++
 .../wayland/shellintegration/qwaylandshellintegration_p.h      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration.cpp b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration.cpp
index 3d2f21c777a..0cefa8a7c25 100644
--- a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration.cpp
+++ b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration.cpp
@@ -8,6 +8,9 @@ QT_BEGIN_NAMESPACE
 
 namespace QtWaylandClient {
 
+QWaylandShellIntegration::~QWaylandShellIntegration()
+    = default; // MUST stay empty until Qt 7 (was inline in Qt < 6.9)
+
 wl_surface *QWaylandShellIntegration::wlSurfaceForWindow(QWaylandWindow *window)
 {
     return window->wlSurface();
diff --git a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h
index 0f76e5aceb5..cd27317e567 100644
--- a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h
+++ b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h
@@ -40,7 +40,7 @@ class Q_WAYLANDCLIENT_EXPORT QWaylandShellIntegration
 {
 public:
     QWaylandShellIntegration() {}
-    virtual ~QWaylandShellIntegration() {}
+    virtual ~QWaylandShellIntegration();
 
     virtual bool initialize(QWaylandDisplay *display) = 0;
     virtual QWaylandShellSurface *createShellSurface(QWaylandWindow *window) = 0;