Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 17 Apr 2026 06:36:24 +0000
From:      Jason E. Hale <jhale@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: db7e2ef53948 - main - x11-toolkits/como: Fix build with Qt 6.10.3+
Message-ID:  <69e1d4e8.3f0cb.13f66079@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch main has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=db7e2ef53948c888398c192de77bcaf2cc38399c

commit db7e2ef53948c888398c192de77bcaf2cc38399c
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2026-04-17 04:11:15 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2026-04-17 06:32:50 +0000

    x11-toolkits/como: Fix build with Qt 6.10.3+
    
    Resolve name shadowing conflict with the QPA 6.10.3+ API.
    
    Qt 6.10.3 added an OffscreenSurface enum to the QPlatformIntegration
    class which shadows the OffscreenSurface class.
    
    MFH:            2026Q2
    With hat:       kde@
---
 .../como/files/patch-plugins_qpa_integration.cpp   | 25 ++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

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 <qpa/qwindowsysteminterface.h>
  
  #include <QtGui/private/qgenericunixfontdatabase_p.h>
 -#include <QtGui/private/qgenericunixthemes_p.h>
  #include <QtGui/private/qunixeventdispatcher_qpa_p.h>
-+
+ 
 +#if QT_VERSION >= QT_VERSION_CHECK(6,10,0)
 +#include <QtGui/private/qgenericunixtheme_p.h>
 +#else
 +#include <QtGui/private/qgenericunixthemes_p.h>
 +#endif
- 
++
  #if !defined(QT_NO_ACCESSIBILITY_ATSPI_BRIDGE)
  #include <QtGui/private/qspiaccessiblebridge_p.h>
+ #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
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e1d4e8.3f0cb.13f66079>