.cirrus.yml

@@ -50,7 +50,6 @@ linux_qt6_sonar_task_template: &LINUX_QT6_TASK_SONAR_TEMPLATE
     - mkdir -pm 0700 $XDG_RUNTIME_DIR
     - Xvfb $DISPLAY -ac -screen 0 1600x1200x24+32 -nolisten tcp -nolisten unix &
     - sleep 1
-    - ccache --set-config sloppiness=pch_defines,time_macros max_size="$CCACHE_SIZE"
     - echo $PATH
     - which qmake6
     - which qbs
@@ -74,7 +73,6 @@ linux_qt6_sonar_task_template: &LINUX_QT6_TASK_SONAR_TEMPLATE
     - find .. -name '*.o' | xargs gcov --preserve-paths
     - cd $CIRRUS_WORKING_DIR
     - sonar-scanner -Dsonar.scm.revision=${CIRRUS_CHANGE_IN_REPO} -Dsonar.links.ci=https://cirrus-ci.com/task/${CIRRUS_TASK_ID} -Dsonar.branch.name=${CIRRUS_BRANCH} -Dsonar.cfamily.gcov.reportsPath="${CIRRUS_WORKING_DIR}/build/coverage-dir"
-    - ccache -s
     
 linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE
   install_script:

appveyor.yml

@@ -538,7 +538,7 @@ for:
 
   cache:
     #- /Users/appveyor/.conan/data -> conanfile.py
-    - /Users/appveyor/brew_cache_dir
+    - /Users/appveyor/cache_dir
 
   init:
     - find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
@@ -596,7 +596,7 @@ for:
 
       sudo ln -s /usr/local /opt/local;
 
-      cache_tag=usr_local # this can be modified to rebuild deps
+      cache_tag=usr_local_4 # this can be modified to rebuild deps
 
       cdir=$HOME/cache_dir
       cache_tar=$cdir/$cache_tag.tar
@@ -655,6 +655,11 @@ 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 -N -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch || true
+    - rm -f $(brew --prefix qbs)/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js.rej
+    - 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
@@ -721,7 +726,7 @@ for:
 
   cache:
     #- /Users/appveyor/.conan/data -> conanfile.py
-    - /Users/appveyor/brew_cache_dir
+    - /Users/appveyor/cache_dir
 
   init:
     - find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
@@ -780,7 +785,7 @@ for:
 
       sudo ln -s /usr/local /opt/local;
 
-      cache_tag=usr_local # this can be modified to rebuild deps
+      cache_tag=usr_local_3 # this can be modified to rebuild deps
 
       cdir=$HOME/cache_dir
       cache_tar=$cdir/$cache_tag.tar

scripts/deploy.py

@@ -131,7 +131,7 @@ def run_clean(refresh_token):
             sys.exit("ERROR: Invalid access token; try re-generating an "
                      "access token from the app console on the web.")
 
-        clean_folders = ["/0.7.x/Mac OS X", "/0.7.x/Windows", "/0.7.x/Linux"]
+        clean_folders = ["/0.7.x/Mac OS X", "/0.7.x/Windows"]
         arhive_types = [r'^valentina-Windows10\+-mingw-x64-Qt.*-develop-[a-f0-9]{40}\.exe$',
                         r'^valentina-Windows7\+-mingw-x86-Qt.*-develop-[a-f0-9]{40}\.exe$',
                         r'^valentina-Windows10\+-msvc-x64-Qt.*-develop-[a-f0-9]{40}\.exe$',

src/libs/ifc/xml/vabstractconverter.cpp

@@ -188,8 +188,6 @@ void VAbstractConverter::ValidateXML(const QString &schema) const
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     XERCES_CPP_NAMESPACE::XercesDOMParser domParser;
-    domParser.setCreateEntityReferenceNodes(true);
-    domParser.setDisableDefaultEntityResolution(true);
     domParser.setErrorHandler(&parserErrorHandler);
 
     QByteArray const data = fileSchema.readAll();