Fixing build script.

.cirrus.yml

@@ -320,6 +320,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
     - clang --version
     - find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
     - sudo xcode-select -p
+    - xcrun --show-sdk-path -sdk macosx
     # Decode the environment variable into a regular .p12 file
     - echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
     # We need to create a new keychain, otherwise using the certificate will prompt
@@ -362,7 +363,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
     - export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
     - echo $PATH
     - python3 --version
-    - pip3 install --break-system-packages --user --upgrade pip dropbox py7zr 'urllib3<2.0' conan==1.63.0 requests
+    - pip3 install --break-system-packages --user --upgrade pip dropbox py7zr 'urllib3<2.0' conan==1.63.0 requests setuptools
     - ccache --set-config sloppiness=pch_defines,time_macros max_size="$CCACHE_SIZE"
     - qmake --version
     - which qmake
@@ -384,11 +385,11 @@ macos_task_template: &MACOS_TASK_TEMPLATE
     - conan profile new valentina
     - conan profile update settings.build_type=Release valentina
     - conan profile update settings.os=Macos valentina
-    - conan profile update settings.os.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina
-    - conan profile update settings.compiler=clang valentina
+    - conan profile update settings.arch=armv8 valentina
+    - conan profile update settings.compiler=apple-clang valentina
     - conan profile update settings.compiler.cppstd=17 valentina
-    - conan profile update settings.compiler.libcxx=libstdc++11 valentina
-    - conan profile update settings.compiler.version=14 valentina
+    - conan profile update settings.compiler.libcxx=libc++ valentina
+    - conan profile update settings.compiler.version=15 valentina
     - qbs setup-toolchains --detect
     - qbs config --list profiles
     - qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6

appveyor.yml

@@ -405,7 +405,7 @@ for:
   build_script:
     - conan profile list
     - conan install . -s os=Windows --build=missing -o with_crash_reporting=%WITH_CRASH_REPORTING% -o with_xerces=True -pr=valentina
-    - qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build --jobs %NUMBER_OF_PROCESSORS% config:release qbs.installRoot:%APPVEYOR_BUILD_FOLDER%\build\install-root\valentina profile:qt6 project.enableConan:true project.conanWithCrashReporting:true project.conanWithXerces:true modules.buildconfig.enableCcache:false project.conanProfiles:valentina modules.buildconfig.enablePCH:%ENABLE_PCH% modules.windeployqt.windeployqtProgramBinPath:%WINDEPLOYQT_BIN_PATH% modules.windeployqt.compilerRuntime:%WINDEPLOYQT_COMPILER_RUNTIME% modules.windeployqt.noCompilerRuntime:%WINDEPLOYQT_NO_COMPILER_RUNTIME%
+    - qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build --jobs %NUMBER_OF_PROCESSORS% config:release qbs.installRoot:%APPVEYOR_BUILD_FOLDER%\build\install-root\valentina profile:qt6 project.enableConan:true project.conanWithCrashReporting:%WITH_CRASH_REPORTING% project.conanWithXerces:true modules.buildconfig.enableCcache:false project.conanProfiles:valentina modules.buildconfig.enablePCH:%ENABLE_PCH% modules.windeployqt.windeployqtProgramBinPath:%WINDEPLOYQT_BIN_PATH% modules.windeployqt.compilerRuntime:%WINDEPLOYQT_COMPILER_RUNTIME% modules.windeployqt.noCompilerRuntime:%WINDEPLOYQT_NO_COMPILER_RUNTIME%
   
   test_script:
     - path
@@ -414,7 +414,7 @@ for:
   deploy_script:
     - ps: |
         if ($env:WITH_CRASH_REPORTING -eq "True") {
-          $qmakeOutput = %QTDIR%\bin\%QMAKE% -query QT_VERSION
+          $qmakeOutput = & "$env:QTDIR\bin\$env:QMAKE" -query QT_VERSION
           $majorMinorVersion = $qmakeOutput -replace '\D+(\d+)\.(\d+).*', '$1_$2'
           $env:CRASH_QT_VERSION = $majorMinorVersion
 
@@ -561,6 +561,7 @@ for:
     - sudo xcode-select -p
     - sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
     - sudo xcode-select -p
+    - xcrun --show-sdk-path -sdk macosx
     # Decode the environment variable into a regular .p12 file
     - echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
     # We need to create a new keychain, otherwise using the certificate will prompt
@@ -685,8 +686,8 @@ for:
     - conan profile update settings.os=Macos valentina
     - conan profile update settings.os.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina
     - conan profile update settings.os.os_build=Macos valentina
-    - conan profile update settings.os.arch=x86_64 valentina
-    - conan profile update settings.os.arch_build=x86_64 valentina
+    - conan profile update settings.arch=x86_64 valentina
+    - conan profile update settings.arch_build=x86_64 valentina
     - conan profile update settings.compiler=apple-clang valentina
     - conan profile update settings.compiler.cppstd=17 valentina
     - conan profile update settings.compiler.libcxx=libc++ valentina
@@ -761,6 +762,7 @@ for:
     - sudo xcode-select -p
     - sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
     - sudo xcode-select -p
+    - xcrun --show-sdk-path -sdk macosx
     # Decode the environment variable into a regular .p12 file
     - echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
     # We need to create a new keychain, otherwise using the certificate will prompt
@@ -884,8 +886,8 @@ for:
     - conan profile update settings.os=Macos valentina
     - conan profile update settings.os.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina
     - conan profile update settings.os_build=Macos valentina
-    - conan profile update settings.os.arch=x86_64 valentina
-    - conan profile update settings.os.arch_build=x86_64 valentina
+    - conan profile update settings.arch=x86_64 valentina
+    - conan profile update settings.arch_build=x86_64 valentina
     - conan profile update settings.compiler=apple-clang valentina
     - conan profile update settings.compiler.cppstd=17 valentina
     - conan profile update settings.compiler.libcxx=libc++ valentina

qbs/imports/VDynamicLib.qbs

@@ -37,7 +37,7 @@ VLib {
         windeployqt.languages: i18nconfig.qtTranslationLocales.join(',')
     }
 
-    installDebugInformation: qbs.buildVariant !== "release" || buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled
+    installDebugInformation: qbs.buildVariant !== "release" || (buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled)
 
     Properties {
         condition: !qbs.targetOS.contains("macos") || (qbs.targetOS.contains("macos") && !buildconfig.enableMultiBundle)
@@ -45,8 +45,5 @@ VLib {
         installDir: buildconfig.installLibraryPath
     }
 
-    Properties {
-        condition: buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled
-        qbs.debugInformation: true
-    }
+    cpp.debugInformation: qbs.buildVariant !== "release" || (buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled)
 }

qbs/imports/VToolApp.qbs

@@ -12,7 +12,7 @@ VApp {
     version: buildconfig.projectVersion
     install: true
     installDir: buildconfig.installBinaryPath
-    installDebugInformation: qbs.buildVariant !== "release" || buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled
+    installDebugInformation: qbs.buildVariant !== "release" || (buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled)
     consoleApplication: false
 
     property bool primaryApp: false
@@ -33,10 +33,7 @@ VApp {
         cpp.dynamicLibraries: ["icudata", "icui18n", "icuuc"]
     }
 
-    Properties {
-        condition: buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled
-        qbs.debugInformation: true
-    }
+    cpp.debugInformation: qbs.buildVariant !== "release" || (buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled)
 
     Group {
         name: "Translations"

qbs/modules/buildconfig/buildconfig.qbs

@@ -42,12 +42,7 @@ Module {
 
     property bool treatWarningsAsErrors: true
 
-    readonly property bool useConanPackages : {
-        if (Utilities.versionCompare(Qt.core.version, "6") < 0)
-            return false;
-
-        return project.enableConan;
-    }
+    readonly property bool useConanPackages : project.enableConan
     readonly property bool conanXercesEnabled : project.conanWithXerces
     readonly property bool conanCrashReportingEnabled : {
         if (qbs.targetOS.contains("windows")) {

src/libs/ifc/xml/vabstractconverter.cpp

@@ -110,9 +110,9 @@ void VAbstractConverter::ReserveFile() const
     QString error;
     QFileInfo const info(m_convertedFileName);
 #if defined(Q_OS_UNIX) || defined(Q_OS_MACOS)
-    const QChar hidden = QChar('.');
+    const QString hidden = QChar('.');
 #else
-    const QChar hidden;
+    const QString hidden;
 #endif
     const QString reserveFileName = u"%1/%2%3(v%4).%5.bak"_s.arg(
         info.absoluteDir().absolutePath(), hidden, info.baseName(), GetFormatVersionStr(), info.completeSuffix());