From 33db27aeaff08b989767d65f5df61825c849693c Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Sun, 5 Jan 2025 12:08:54 +0100
Subject: [PATCH] QWaylandShellIntegrationTemplate: swap order of base classes

The QObject must alwyas come first.

This is BiC, but it's a private header, so we don't care.

Amends a7bb7210ac76a397b4aec8d8f32d902dc932d855.

Pick-to: 6.9
Change-Id: I35edce36d1cc7f5d61f7c3457ca6541e827288a0
Reviewed-by: David Redondo <qt@david-redondo.de>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 .../wayland/shellintegration/qwaylandshellintegration_p.h     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h
index cd27317e567..44c8cdb444b 100644
--- a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h
+++ b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h
@@ -55,7 +55,9 @@ public:
 };
 
 template <typename T>
-class Q_WAYLANDCLIENT_EXPORT QWaylandShellIntegrationTemplate : public QWaylandShellIntegration, public QWaylandClientExtension
+class Q_WAYLANDCLIENT_EXPORT QWaylandShellIntegrationTemplate
+    : public QWaylandClientExtension,
+      public QWaylandShellIntegration
 {
 public:
     QWaylandShellIntegrationTemplate(const int ver) :