.cirrus.yml

@@ -148,7 +148,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
   env:
     ACCESS_TOKEN: ENCRYPTED[81e0b2381ffb628b73f5c94f834010e6631191e0ad03cdd0850d440fb2737a74b68131d842030f010c1bf73ab4cdc1ae]
     QTDIR: "/opt/homebrew/opt/qt6"
-    PATH: $QTDIR/bin:${PATH}
+    PATH: ${HOME}/.local/bin:$QTDIR/bin:${PATH}
     # ^  add user paths
     PIP_CACHE_DIR: ${HOME}/.cache/pip
     LDFLAGS: "-L$QTDIR/lib"
@@ -168,9 +168,6 @@ macos_task_template: &MACOS_TASK_TEMPLATE
     - sudo xcode-select -p
     - brew update > /dev/null
     - brew install --force qt6 coreutils ccache qbs cmake
-    - echo $PATH
-    - export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
-    - echo $PATH
     - chmod -R 755 /opt/homebrew/opt/qt6/*
     - python3 --version
     - pip3 install --user --upgrade pip dropbox conan==1.59
@@ -180,9 +177,6 @@ macos_task_template: &MACOS_TASK_TEMPLATE
     - which qmake
     - qbs --version
   build_script:
-    - echo $PATH
-    - export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
-    - echo $PATH
     - pwd
     - conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=xerces-c/3.2.4
     - qbs setup-toolchains --detect

appveyor.yml

@@ -47,7 +47,6 @@ environment:
       QT: Qt\6.4\mingw_64
       QT_VERSION: Qt6_4
       BUILD_SYSTEM: "qbs"
-      ENABLE_PCH: false
       GCC_VERSION: 11.2
       MINGW_PATH: C:\Qt\Tools\mingw1120_64\bin
       ARCH: x64
@@ -61,7 +60,6 @@ environment:
       QT: Qt\5.15\mingw81_32
       QT_VERSION: Qt5_15
       BUILD_SYSTEM: "qbs"
-      ENABLE_PCH: true
       GCC_VERSION: 8.1
       MINGW_PATH: C:\Qt\Tools\mingw810_32\bin
       ARCH: x86
@@ -84,7 +82,7 @@ environment:
     - job_name: MacOS_12_Qt_6_4 (multibundle)
       APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
       COMPILER: clang
-      QT: ${HOME}/Qt/6.4/macos
+      QT: $HOME/Qt/6.4/macos
       QT_VERSION: Qt6_4
       BUILD_SYSTEM: "qbs"
       ARCH: x64
@@ -98,7 +96,7 @@ environment:
     - job_name: MacOS_12_Qt_6_4 (singlebundle)
       APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
       COMPILER: clang
-      QT: ${HOME}/Qt/6.4/macos
+      QT: $HOME/Qt/6.4/macos
       QT_VERSION: Qt6_4
       BUILD_SYSTEM: "qbs"
       ARCH: x64
@@ -112,7 +110,7 @@ environment:
     - job_name: MacOS_10_15_Qt_5_15 (qbs, multibundle)
       APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
       COMPILER: clang
-      QT: ${HOME}/Qt/5.15/clang_64
+      QT: $HOME/Qt/5.15/clang_64
       QT_VERSION: Qt5_15
       BUILD_SYSTEM: "qbs"
       ARCH: x64
@@ -126,7 +124,7 @@ environment:
     - job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle)
       APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
       COMPILER: clang
-      QT: ${HOME}/Qt/5.15/clang_64
+      QT: $HOME/Qt/5.15/clang_64
       QT_VERSION: Qt5_15
       BUILD_SYSTEM: "qbs"
       ARCH: x64
@@ -155,7 +153,6 @@ environment:
       QT: Qt\6.4\msvc2019_64
       QT_VERSION: Qt6_4
       BUILD_SYSTEM: "qbs"
-      ENABLE_PCH: true
       MSVC_PATH: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\MSVC\\14.29.30133\\bin\\Hostx64\\x64"
       ARCH: x64
       PYTHON: "C:\\Python311-x64"
@@ -168,7 +165,6 @@ environment:
       QT: Qt\6.4\msvc2019_arm64
       QT_VERSION: Qt6_4
       BUILD_SYSTEM: "qbs"
-      ENABLE_PCH: true
       MSVC_PATH: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\MSVC\\14.29.30133\\bin\\Hostx64\\arm64"
       ARCH: arm64
       PYTHON: "C:\\Python311-x64"
@@ -181,7 +177,6 @@ environment:
       QT: Qt\5.15\mingw81_64
       QT_VERSION: Qt5_15
       BUILD_SYSTEM: "qbs"
-      ENABLE_PCH: true
       GCC_VERSION: 8.1
       MINGW_PATH: C:\Qt\Tools\mingw810_64\bin
       ARCH: x64
@@ -194,7 +189,6 @@ environment:
       COMPILER: msvc
       QT: Qt\5.15\msvc2019_64
       BUILD_SYSTEM: "qbs"
-      ENABLE_PCH: true
       MSVC_PATH: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\MSVC\\14.29.30133\\bin\\Hostx64\\x64"
       VSVER: 16
       ARCH: x64
@@ -228,7 +222,7 @@ environment:
     - job_name: MacOS_10_15_Qt_5_15 (make)
       APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
       COMPILER: clang
-      QT: ${HOME}/Qt/5.15/clang_64
+      QT: $HOME/Qt/5.15/clang_64
       QT_VERSION: Qt5_15
       BUILD_SYSTEM: "make"
       ARCH: x64
@@ -310,31 +304,23 @@ for:
     # Path before 
     - path
     - set QTDIR=C:\%QT%
-    - set PATH=%QTDIR%\bin;%QTDIR%\include;C:\Qt\Tools\QtCreator\bin;C:\Tools\PsTools;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\Git LFS;C:\Tools\GitVersion;C:\Windows\system32;C:\Windows;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\CMake\bin;%PYTHON%;%PYTHON%\Scripts
+    - set PATH=%QTDIR%\bin;%QTDIR%\include;C:\Qt\Tools\QtCreator\bin;C:\Tools\PsTools;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\Git LFS;C:\Tools\GitVersion;C:\Windows\system32;C:\Windows;C:\Windows\System32\WindowsPowerShell\v1.0\;%PYTHON%;%PYTHON%\Scripts
     # Set VC variables for the platform
     - ps: |
         if ($env:COMPILER -eq "msvc") {
           if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2022") {
             if ($env:ARCH -eq "x64") {
               & "C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
-            } elseif ($env:ARCH -eq "arm64") {
-              & "C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
             } else {
               & "C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat"
             }
           } elseif ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2019") {
             if ($env:ARCH -eq "x64") {
               & "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
-            } elseif ($env:ARCH -eq "arm64") {
-              & "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
             } else {
               & "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat"
             }
           }   
-        } else {
-          $env:Path += ";$env:MINGW_PATH"
-          $env:CC = "gcc.exe"
-          $env:CXX = "g++.exe"
         }
     # Path after
     - path
@@ -388,7 +374,7 @@ for:
 
   build_script:
     - conan install . -s os=Windows --build=xerces-c/3.2.4 -pr valentina
-    - qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build --command-echo-mode command-line config:release qbs.installRoot:%APPVEYOR_BUILD_FOLDER%\build\install-root\valentina profile:qt6 project.enableConan:true modules.buildconfig.enableCcache:false project.conanProfiles:valentina modules.buildconfig.enablePCH:%ENABLE_PCH%
+    - qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build --command-echo-mode command-line config:release qbs.installRoot:%APPVEYOR_BUILD_FOLDER%\build\install-root\valentina profile:qt6 project.enableConan:true modules.buildconfig.enableCcache:false project.conanProfiles:[valentina]
   
   test_script:
     - qbs -p autotest-runner -d %APPVEYOR_BUILD_FOLDER%\build profile:qt6 config:release
@@ -501,6 +487,9 @@ for:
       - job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle)
 
   init:
+    - export QTDIR=$QT
+    - export PATH="$QTDIR/bin:$PATH"
+    - echo $PATH
     - find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
     - sudo xcode-select -p
     - sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
@@ -511,9 +500,6 @@ for:
     - rm '/usr/local/bin/cpack'
     - rm '/usr/local/bin/ctest'
     - brew install --force coreutils qbs cmake
-    - export QTDIR="$QT"
-    - export PATH="$QTDIR/bin:$HOME/.local/bin:`python3 -m site --user-base`/bin:$PATH"
-    - echo $PATH
     - python3 --version
     - |
       if [[ "$ENABLE_CONAN" == "true" ]]; then
@@ -551,8 +537,8 @@ for:
       - job_name: MacOS_10_15_Qt_5_15 (make)
 
   init:
-    - export QTDIR="$QT"
-    - export PATH="$QTDIR/bin:$PATH"
+    - QTDIR=$QT
+    - PATH="$QTDIR/bin:$PATH"
     - echo $PATH
     - find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
     - sudo xcode-select -p

src/libs/ifc/xml/vparsererrorhandler.h

@@ -28,7 +28,6 @@
 #ifndef VPARSERERRORHANDLER_H
 #define VPARSERERRORHANDLER_H
 
-#include <QString>
 #include <QtGlobal>
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)

src/libs/vmisc/vtextcodec.h

@@ -28,11 +28,6 @@
 #ifndef VTEXTCODEC_H
 #define VTEXTCODEC_H
 
-#include <QStringConverter>
-#include <QtCore/qcontainerfwd.h>
-
-class QByteArray;
-
 class VTextCodec
 {
 public: