Fix build.

.cirrus.yml

@@ -230,6 +230,8 @@ macos_task_template: &MACOS_TASK_TEMPLATE
     - security find-identity -v -p codesigning
     - brew update > /dev/null
     - brew install qt6 coreutils ccache qbs cmake ninja git openssl@1.1 pkg-config poppler xerces-c
+    - brew outdated
+    - brew upgrade qt6 qbs
     - echo $PATH
     - export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
     - echo $PATH

src/app/puzzle/scene/scenedef.h

@@ -28,7 +28,7 @@
 #ifndef SCENEDEF_H
 #define SCENEDEF_H
 
-#include "qtypes.h"
+#include <QtGlobal>
 
 enum class PGraphicsItem : int
 {

src/app/puzzle/scene/vpgraphicspiece.cpp

@@ -49,14 +49,13 @@
 #include "../vlayout/vgraphicsfillitem.h"
 #include "../vlayout/vlayoutpiecepath.h"
 #include "../vlayout/vtextmanager.h"
+#include "../vmisc/compatibility.h"
 #include "../vmisc/svgfont/vsvgfont.h"
 #include "../vmisc/svgfont/vsvgfontdatabase.h"
 #include "../vmisc/svgfont/vsvgfontengine.h"
 #include "../vmisc/theme/vscenestylesheet.h"
 #include "../vpapplication.h"
 #include "../vpatterndb/vpiecepath.h"
-#include "compatibility.h"
-#include "qtpreprocessorsupport.h"
 #include "undocommands/vpundomovepieceonsheet.h"
 #include "undocommands/vpundopiecemove.h"
 #include "vpiecegrainline.h"

src/app/puzzle/scene/vpgraphicssheet.cpp

@@ -63,7 +63,7 @@ void PaintVerticalFoldShadow(QPainter *painter, const QRectF &sheetRect)
     painter->drawLine(shadowLine);
     painter->drawLine(QLineF(shadowLine.p2(), shadowP));
 
-    QPolygonF const shadow{sheetRect.topLeft(), shadowLine.p2(), shadowP, sheetRect.topLeft()};
+    QPolygonF const shadow({sheetRect.topLeft(), shadowLine.p2(), shadowP, sheetRect.topLeft()});
 
     painter->setBrush(QBrush(VSceneStylesheet::ManualLayoutStyle().SheetFoldShadowColor()));
     painter->drawPolygon(shadow);
@@ -81,7 +81,7 @@ void PaintHorizontalFoldShadow(QPainter *painter, const QRectF &sheetRect)
     painter->drawLine(shadowLine);
     painter->drawLine(QLineF(shadowLine.p2(), shadowP));
 
-    QPolygonF const shadow{sheetRect.topRight(), shadowLine.p2(), shadowP, sheetRect.topRight()};
+    QPolygonF const shadow({sheetRect.topRight(), shadowLine.p2(), shadowP, sheetRect.topRight()});
 
     painter->setBrush(QBrush(VSceneStylesheet::ManualLayoutStyle().SheetFoldShadowColor()));
     painter->drawPolygon(shadow);

src/libs/vlayout/vfoldline.h

@@ -74,6 +74,7 @@ class VFoldLine
     Q_DECLARE_TR_FUNCTIONS(VFoldLine) // NOLINT
 
 public:
+    VFoldLine() = default;
     VFoldLine(const QLineF &line, FoldLineType type);
 
     void SetHeight(qreal newHeight);