1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QWaylandShellIntegrationTemplate: swap order of base classes

Browse Source 
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>
This commit is contained in:
Marc Mutz 2025-01-05 12:08:54 +01:00
parent 8fb0ceeb95
commit 33db27aeaf
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h
View File

@ -55,7 +55,9 @@ public:
}; };
template <typename T> template <typename T>
class Q_WAYLANDCLIENT_EXPORT QWaylandShellIntegrationTemplate : public QWaylandShellIntegration, public QWaylandClientExtension class Q_WAYLANDCLIENT_EXPORT QWaylandShellIntegrationTemplate
: public QWaylandClientExtension,
public QWaylandShellIntegration
{ {
public: public:
QWaylandShellIntegrationTemplate(const int ver) : QWaylandShellIntegrationTemplate(const int ver) :