Switch back to GCC 13 for Qt5 QMake.

.cirrus.yml

@@ -44,7 +44,7 @@ linux_qt6_task_template: &LINUX_QT6_TASK_TEMPLATE
     
 linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE
   install_script:
-    - bash -c "$PACKAGE_MANAGER_INSTALL qtbase5-dev libqt5svg5-dev qttools5-dev-tools libqt5xmlpatterns5-dev libqt5core5a libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 poppler-utils"
+    - bash -c "$PACKAGE_MANAGER_INSTALL qtbase5-dev libqt5svg5-dev qttools5-dev-tools libqt5xmlpatterns5-dev libqt5core5a libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 poppler-utils libstdc++6"
   build_script:
     - uname -a
     - echo $PATH
@@ -125,6 +125,21 @@ linux_task:
           container:
             cpu: 8
             memory: 8G  # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
+    - container:
+        image: dismine/gcc-ubuntu:13
+      env:
+        COMPILER: gcc
+        QMAKE_SPEC: "linux-g++"
+        GCC_COLORS: 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+        COMPILER_REGEX: "gcc|g\\+\\+"
+      matrix:
+        - name: 'GCC 13 [Qt5 QMake]'
+          << :  *LINUX_QT5_QMAKE_TASK_TEMPLATE
+          env:
+            QT_SELECT: "qt5"
+          container:
+            cpu: 2 
+            memory: 8G  # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
     - container:
         image: dismine/gcc-ubuntu:latest
       env:
@@ -133,13 +148,6 @@ linux_task:
         GCC_COLORS: 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
         COMPILER_REGEX: "gcc|g\\+\\+"
       matrix:
-        - name: 'latest GCC [Qt5 QMake]'
-          << :  *LINUX_QT5_QMAKE_TASK_TEMPLATE
-          env:
-            QT_SELECT: "qt5"
-          container:
-            cpu: 2 
-            memory: 8G  # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
         - name: 'latest GCC [Qt5 QBS]'
           << : *LINUX_QT5_QBS_TASK_TEMPLATE
           env:
@@ -154,8 +162,8 @@ linux_task:
             QT_SELECT: "qt6"
             ENABLE_CCACHE: true
           container:
-            cpu: 3
+            cpu: 4
-            memory: 12G  # Set to 12GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
+            memory: 16G  # Set to 16GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
 
 macos_task_template: &MACOS_TASK_TEMPLATE
   << : *REGULER_TASK_TEMPLATE
@@ -246,6 +254,10 @@ macos_task_template: &MACOS_TASK_TEMPLATE
     - qmake --version
     - which qmake
     - qbs --version
+    # Patch Qbs. Remove after Qbs 2.2.1+.
+    - curl https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch --output $HOME/qbs-pkg-config-probe.patch --silent
+    - patch -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch
+    - rm $HOME/qbs-pkg-config-probe.patch
   build_script:
     - echo $PATH
     - export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"

appveyor.yml

@@ -726,6 +726,10 @@ for:
     - which qmake
     - which qbs
     - qbs --version
+    # Patch Qbs. Remove after Qbs 2.2.1+.
+    - curl https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch --output $HOME/qbs-pkg-config-probe.patch --silent
+    - patch -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch
+    - rm $HOME/qbs-pkg-config-probe.patch
     - /usr/bin/curl -LJ https://github.com/dismine/macdeployqt/archive/refs/heads/main.zip --output ${HOME}/macdeployqt-main.zip --silent
     - unzip ${HOME}/macdeployqt-main.zip -d ${HOME}
     - cmake ${HOME}/macdeployqt-main -GNinja -S ${HOME}/macdeployqt-main -B ${HOME}/macdeployqt-build-dir -DCMAKE_INSTALL_PREFIX=${HOME}/macdeployqt-install-dir -DCMAKE_BUILD_TYPE=Release
@@ -905,6 +909,10 @@ for:
     - qmake --version
     - which qmake
     - qbs --version
+    # Patch Qbs. Remove after Qbs 2.2.1+.
+    - curl https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch --output $HOME/qbs-pkg-config-probe.patch --silent
+    - patch -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch
+    - rm $HOME/qbs-pkg-config-probe.patch
     - /usr/bin/curl -LJ https://github.com/dismine/macdeployqt/archive/refs/heads/main.zip --output ${HOME}/macdeployqt-main.zip --silent
     - unzip ${HOME}/macdeployqt-main.zip -d ${HOME}
     - cmake ${HOME}/macdeployqt-main -S ${HOME}/macdeployqt-main -B ${HOME}/macdeployqt-build-dir -DCMAKE_INSTALL_PREFIX=${HOME}/macdeployqt-install-dir -DCMAKE_BUILD_TYPE=Release

qbs/modules/ccache/ccache.qbs

@@ -56,8 +56,8 @@ Module {
                         pchSupport = false;
                     }else{
                         if (clangToolchain) {
-                            if (Utilities.versionCompare(version, "4.6") < 0) {
+                            if (Utilities.versionCompare(version, "4.10") < 0) {
-                                console.info("ccache version < 4.6 is not compatible with Clang and precompiled headers.");
+                                console.info("ccache version < 4.10 is not compatible with Clang and precompiled headers.");
                                 pchSupport = false;
                             }
                         } else {

src/libs/vdxf/vdxfengine.cpp

@@ -1276,6 +1276,10 @@ void VDxfEngine::ExportAAMADrawFoldLine(const QSharedPointer<dx_ifaceBlock> &det
 {
     VFoldLine const fLine = detail.FoldLine();
     QVector<QVector<QPointF>> points = fLine.FoldLineMarkPoints();
+    if (points.isEmpty())
+    {
+        return;
+    }
 
     switch (detail.GetFoldLineType())
     {
@@ -1728,6 +1732,10 @@ void VDxfEngine::ExportASTMDrawFoldLine(const QSharedPointer<dx_ifaceBlock> &det
 {
     VFoldLine const fLine = detail.FoldLine();
     QVector<QVector<QPointF>> points = fLine.FoldLineMarkPoints();
+    if (points.isEmpty())
+    {
+        return;
+    }
 
     switch (detail.GetFoldLineType())
     {