From 232589197e003b4ef2c37292274c7a475bbcba52 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Thu, 10 Apr 2025 15:16:02 +0200 Subject: [PATCH 1/2] Fix build with Qt 6 These private APIs have now changed and QDataBuffer checks that the types are trivially destructible / trivially copyable. --- src/view/quick/qopengl2pexvertexarray_p.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/view/quick/qopengl2pexvertexarray_p.h b/src/view/quick/qopengl2pexvertexarray_p.h index f80975ed..65058333 100644 --- a/src/view/quick/qopengl2pexvertexarray_p.h +++ b/src/view/quick/qopengl2pexvertexarray_p.h @@ -80,6 +80,8 @@ class QOpenGLPoint operator QPointF() const {return QPointF(x,y);} }; +Q_DECLARE_TYPEINFO(QOpenGLPoint, Q_PRIMITIVE_TYPE); + struct QOpenGLRect { QOpenGLRect(const QRectF &r) @@ -96,6 +98,8 @@ struct QOpenGLRect operator QRectF() const {return QRectF(left, top, right-left, bottom-top);} }; +Q_DECLARE_TYPEINFO(QOpenGLRect, Q_PRIMITIVE_TYPE); + class QOpenGL2PEXVertexArray { public: From bbc1d467f4ade59fa11edac92e61759b26e2589d Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Thu, 10 Apr 2025 18:26:33 +0100 Subject: [PATCH 2/2] ci: Add coverage for Qt 6.9 --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 66f22ee2..863e23a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,10 @@ jobs: qt_modules: qtscxml qt_arch: win64_msvc2019_64 macos_architectures: "x86_64;arm64" - + - qt_version: 6.9.0 # Bump to latest freely + qt_modules: qtscxml + qt_arch: win64_msvc2022_64 + macos_architectures: "x86_64;arm64" steps: - name: Install Dependencies on Linux if: ${{ runner.os == 'Linux' }}