From 5bd67285fd78820683a968dace6fd20184f68ebb 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.9 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 711eb8cfb85010d35f80ef053525442ab2f9bd4d Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Thu, 24 Apr 2025 14:59:46 +0100 Subject: [PATCH 2/2] ci: Explicitly request windows-2019 'windows-latest' has been bumped by GitHub to windows-2022 causing breakage. First priority is to get CI green again and fix build with 6.9 For issue #85 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 66f22ee2..5484ebbc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: matrix: os: - ubuntu-latest - - windows-latest + - windows-2019 - macos-latest build_type: - Debug