.cirrus.yml

@@ -154,36 +154,31 @@ macos_task_template: &MACOS_TASK_TEMPLATE
     LDFLAGS: "-L$QTDIR/lib"
     CPPFLAGS: "-I$QTDIR/include"
     PKG_CONFIG_PATH: "/opt/homebrew/opt/qt6/lib/pkgconfig"
+  global_homebrew_cache:
+    folder: "/usr/local/Homebrew"
   local_homebrew_cache:
     folder: "$HOME/Library/Caches/Homebrew"
-  global_conan_cache:
-    folder: "$HOME/Library/Caches/Conan"
-  local_conan_cache:
-    folder: "~/.conan/data"
   pip_cache:
     folder: ${PIP_CACHE_DIR}
   install_script:
     - brew update > /dev/null
-    - brew install qt6 coreutils ccache conan qbs cmake
+    - brew install qt6 coreutils ccache conan qbs
     - chmod -R 755 /opt/homebrew/opt/qt6/*
     - python3 --version
     - pip3 install --user --upgrade pip dropbox
     - ccache --set-config=sloppiness=pch_defines,time_macros
-    - conan --version
     - clang --version
     - qmake --version
     - which qmake
     - qbs --version
   build_script:
     - pwd
-    - conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=xerces-c
     - qbs setup-toolchains --detect
     - qbs config --list profiles
     - qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6
     - qbs-config defaultProfile qt6
     - qbs config profiles.qt6.baseProfile clang
-    - echo qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --command-echo-mode command-line config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET}
+    - qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --command-echo-mode command-line config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.enableConan:true
-    - qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --command-echo-mode command-line config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET}
     - ccache -s
   deploy_script:
     - pwd
@@ -200,7 +195,6 @@ macos_task:
     QT_BRANCH: Qt6
     ARCHITECTURE: arm64
     PLATFORM: "macOS_11+"
-    MACOS_DEPLOYMENT_TARGET: 11.0
   matrix:
     - name: 'macOS Monterey 12 [signle bundle, no tests]'
       env:

conanfile.py

@@ -1,15 +0,0 @@
-import os
-
-from conans import ConanFile
-
-class Recipe(ConanFile):
-  settings = "os"
-  requires = "xerces-c/[>=3.2,<4.0]"
-  default_options = {"xerces-c:shared": True}
-
-  def configure(self):
-    if self.settings.os == "Linux":
-      self.options["xerces-c"].shared = False
-
-    if self.settings.os == "Macos" and "MACOS_DEPLOYMENT_TARGET" in os.environ:
-      self.settings.os.version = os.environ["MACOS_DEPLOYMENT_TARGET"]

conanfile.txt

@@ -0,0 +1,2 @@
+[requires]
+xerces-c/[>=3.2,<4.0] 

qbs/modules/buildconfig/buildconfig.qbs

@@ -149,9 +149,6 @@ Module {
     }
 
     readonly property string minimumMacosVersion: {
-        if (project.minimumMacosVersion !== undefined)
-            return project.minimumMacosVersion;
-
         // Check which minimal OSX version supports current Qt version
         if (Qt.core.versionMajor >= 6) {
             // For Qt 6.5 https://doc-snapshots.qt.io/qt6-6.5/supported-platforms.html

qbs/modules/multibundle/multibundle.qbs

@@ -98,7 +98,7 @@ Module {
             cmd.description = "Copying auxiliary binary into bundle";
             cmd.highlight = "filegen";
 
-            const fileName = product.bundle.isBundle ? product.bundle.bundleName : inputs["application"][0].fileName;
+            const fileName = product.bundle.isBundle ? product.bundle.bundleName : inputs["dynamiclibrary"][0].fileName;
             const installRoot = product.qbs.installRoot + product.qbs.installPrefix + "/" + product.buildconfig.installAppPath;
             var data = [];
             product.multibundle.targetApps.forEach(function(targetApp) {

src/app/puzzle/puzzle.qbs

@@ -17,12 +17,6 @@ VToolApp {
     targetName: buildconfig.appTarget
     multibundle.targetApps: ["Valentina"]
 
-    Properties {
-        condition: buildconfig.useConanPackages && buildconfig.enableMultiBundle
-        conan.XercesC.libInstallDir: qbs.installPrefix + "/" + buildconfig.installLibraryPath
-        conan.XercesC.installLib: true
-    }
-
     files: [
         "main.cpp",
         "vpapplication.cpp",

src/app/tape/tape.qbs

@@ -21,12 +21,6 @@ VToolApp {
     targetName: buildconfig.appTarget
     multibundle.targetApps: ["Valentina"]
 
-    Properties {
-        condition: buildconfig.useConanPackages && buildconfig.enableMultiBundle
-        conan.XercesC.libInstallDir: qbs.installPrefix + "/" + buildconfig.installLibraryPath
-        conan.XercesC.installLib: true
-    }
-
     files: [
         "main.cpp",
         "tmainwindow.cpp",

src/app/valentina/valentina.qbs

@@ -32,12 +32,6 @@ VToolApp {
     buildconfig.appTarget: qbs.targetOS.contains("macos") ? "Valentina" : "valentina"
     targetName: buildconfig.appTarget
 
-    Properties {
-        condition: buildconfig.useConanPackages
-        conan.XercesC.libInstallDir: qbs.installPrefix + "/" + buildconfig.installLibraryPath
-        conan.XercesC.installLib: true
-    }
-
     files: [
         "main.cpp",
         "mainwindow.cpp",

src/libs/ifc/ifc.qbs

@@ -19,6 +19,11 @@ VLib {
         condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 && buildconfig.useConanPackages
     }
 
+    Properties {
+        condition: buildconfig.useConan && (qbs.targetOS.contains("macos") || qbs.targetOS.contains("windows"))
+        conan.XercesC.installLib: true
+    }
+
     name: "IFCLib"
     files: [
         "ifcdef.h",

src/libs/ifc/xml/vabstractconverter.cpp

@@ -190,12 +190,11 @@ void VAbstractConverter::ValidateXML(const QString &schema) const
 
     if (tempSchema->open())
     {
-        XERCES_CPP_NAMESPACE::XercesDOMParser domParser;
+        XercesDOMParser domParser;
         domParser.setErrorHandler(&parserErrorHandler);
 
         if (domParser.loadGrammar(
-                tempSchema->fileName().toUtf8().constData(),
+                tempSchema->fileName().toUtf8().constData(), Grammar::SchemaGrammarType, true) == nullptr)
-                XERCES_CPP_NAMESPACE::Grammar::SchemaGrammarType, true) == nullptr)
         {
             VException e(parserErrorHandler.StatusMessage());
             e.AddMoreInformation(tr("Could not load schema file '%1'.").arg(fileSchema.fileName()));
@@ -212,7 +211,7 @@ void VAbstractConverter::ValidateXML(const QString &schema) const
             throw e;
         }
 
-        domParser.setValidationScheme(XERCES_CPP_NAMESPACE::XercesDOMParser::Val_Always);
+        domParser.setValidationScheme(XercesDOMParser::Val_Always);
         domParser.setDoNamespaces(true);
         domParser.setDoSchema(true);
         domParser.setValidationConstraintFatal(true);

src/libs/ifc/xml/vparsererrorhandler.cpp

@@ -91,30 +91,30 @@ auto VParserErrorHandler::Column() const -> XMLFileLoc
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VParserErrorHandler::handleMessage(const XERCES_CPP_NAMESPACE::SAXParseException &ex)
+void VParserErrorHandler::handleMessage(const SAXParseException &ex)
 {
-    char* msg = XERCES_CPP_NAMESPACE::XMLString::transcode(ex.getMessage());
+    char* msg = XMLString::transcode(ex.getMessage());
     m_description = QString(msg);
     m_line = ex.getLineNumber();
     m_column = ex.getColumnNumber();
     m_hasError = true;
-    XERCES_CPP_NAMESPACE::XMLString::release(&msg);
+    XMLString::release(&msg);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VParserErrorHandler::warning(const XERCES_CPP_NAMESPACE::SAXParseException &ex)
+void VParserErrorHandler::warning(const SAXParseException &ex)
 {
     handleMessage(ex);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VParserErrorHandler::error(const XERCES_CPP_NAMESPACE::SAXParseException &ex)
+void VParserErrorHandler::error(const SAXParseException &ex)
 {
     handleMessage(ex);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VParserErrorHandler::fatalError(const XERCES_CPP_NAMESPACE::SAXParseException &ex)
+void VParserErrorHandler::fatalError(const SAXParseException &ex)
 {
     handleMessage(ex);
 }

src/libs/ifc/xml/vparsererrorhandler.h

@@ -61,16 +61,18 @@ private:
 #include <xercesc/sax/ErrorHandler.hpp>
 #include <xercesc/sax/SAXParseException.hpp>
 
-class VParserErrorHandler : public XERCES_CPP_NAMESPACE::ErrorHandler
+XERCES_CPP_NAMESPACE_USE
+
+class VParserErrorHandler : public ErrorHandler
 {
 public:
     auto StatusMessage() const -> QString;
     auto Line() const -> XMLFileLoc;
     auto Column() const -> XMLFileLoc;
 
-    void warning(const XERCES_CPP_NAMESPACE::SAXParseException& ex) override;
+    void warning(const SAXParseException& ex) override;
-    void error(const XERCES_CPP_NAMESPACE::SAXParseException& ex) override;
+    void error(const SAXParseException& ex) override;
-    void fatalError(const XERCES_CPP_NAMESPACE::SAXParseException& ex) override;
+    void fatalError(const SAXParseException& ex) override;
     void resetErrors() override;
 
     auto HasError() const -> bool;
@@ -81,7 +83,7 @@ private:
     QString    m_description{};
     bool       m_hasError{false};
 
-    void handleMessage(const XERCES_CPP_NAMESPACE::SAXParseException& ex);
+    void handleMessage(const SAXParseException& ex);
 };
 
 #endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0)

src/libs/vtools/tools/backgroundimage/vbackgroundpixmapitem.cpp

@@ -40,7 +40,7 @@ namespace
 auto InvalidImage() -> QPixmap
 {
     QImageReader imageReader(VBackgroundPatternImage::brokenImage);
-    return QPixmap::fromImageReader(&imageReader);
+    return std::move(QPixmap::fromImageReader(&imageReader));
 }
 }
 

src/test/ValentinaTest/tst_xsdschema.cpp

@@ -69,12 +69,11 @@ void ValidateSchema(const QString &schema)
 
     if (tempSchema->open())
     {
-        XERCES_CPP_NAMESPACE::XercesDOMParser domParser;
+        XercesDOMParser domParser;
         domParser.setErrorHandler(&parserErrorHandler);
 
         if (domParser.loadGrammar(
-                tempSchema->fileName().toUtf8().constData(),
+                tempSchema->fileName().toUtf8().constData(), Grammar::SchemaGrammarType, true) == nullptr)
-                XERCES_CPP_NAMESPACE::Grammar::SchemaGrammarType, true) == nullptr)
         {
             QFAIL(qUtf8Printable(QStringLiteral("%1 Could not load schema file '%2'.")
                                      .arg(parserErrorHandler.StatusMessage(), fileSchema.fileName())));

valentina.qbs

@@ -5,13 +5,17 @@ Project {
     minimumQbsVersion: "1.16"
 
     property bool enableConan: false
-    property string minimumMacosVersion: undefined
 
     Probes.ConanfileProbe {
         id: thirdPartyConanPackages
         condition: enableConan
-        conanfilePath: project.sourceDirectory + "/conanfile.py"
+        conanfilePath: project.sourceDirectory + "/conanfile.txt"
-        verbose: true
+        options: {
+            if (qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos"))
+                return ({"xerces-c:shared": "False"});
+
+            return ({"xerces-c:shared": "True"});
+        }
     }
 
     references: [