diff --git a/x11-toolkits/como/files/patch-plugins_qpa_integration.cpp b/x11-toolkits/como/files/patch-plugins_qpa_integration.cpp index 4424cdf8aa0d..7540455dad23 100644 --- a/x11-toolkits/como/files/patch-plugins_qpa_integration.cpp +++ b/x11-toolkits/como/files/patch-plugins_qpa_integration.cpp @@ -1,20 +1,37 @@ -Adapt for Qt 6.10.0. The private QPA header genericunixthemes_p.h was +Hunk 1: Adapt for Qt 6.10.0. The private QPA header genericunixthemes_p.h was renamed to qgenericunixtheme_p.h. +Hunk 2: Adapt for Qt 6.10.3. The OffscreenSurface class is shadowed by the +inherited OffscreenSurface enumerator defined in +${LOCALBASE}/include/qt6/QtGui/${QT6_VERSION}/QtGui/qpa/qplatformintegration.h +after [1]. + +[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=31819fe28ef9a54097cc0ca4e892f20abc131675 + --- plugins/qpa/integration.cpp.orig 2024-10-09 12:19:16 UTC +++ plugins/qpa/integration.cpp -@@ -25,8 +25,13 @@ SPDX-License-Identifier: GPL-2.0-or-later +@@ -25,9 +25,14 @@ SPDX-License-Identifier: GPL-2.0-or-later #include #include -#include #include -+ + +#if QT_VERSION >= QT_VERSION_CHECK(6,10,0) +#include +#else +#include +#endif - ++ #if !defined(QT_NO_ACCESSIBILITY_ATSPI_BRIDGE) #include + #endif +@@ -117,7 +122,7 @@ Integration::createPlatformOffscreenSurface(QOffscreen + QPlatformOffscreenSurface* + Integration::createPlatformOffscreenSurface(QOffscreenSurface* surface) const + { +- return new OffscreenSurface(surface); ++ return new como::QPA::OffscreenSurface(surface); + } + + QPlatformFontDatabase* Integration::fontDatabase() const