From b85e0fe3f875ec161c9784f89c4aaca8da405eb3 Mon Sep 17 00:00:00 2001
From: Yann Lossouarn <yann@lossouarn.net>
Date: Tue, 13 Feb 2024 11:59:34 +0100
Subject: [PATCH] Correction of build errors with MacOS Sonoma

---
 src/test/CollectionTest/CollectionTest.qbs     | 13 ++++++++++++-
 src/test/TranslationsTest/TranslationsTest.qbs | 12 +++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/test/CollectionTest/CollectionTest.qbs b/src/test/CollectionTest/CollectionTest.qbs
index 6582f4abc..7918e04f7 100644
--- a/src/test/CollectionTest/CollectionTest.qbs
+++ b/src/test/CollectionTest/CollectionTest.qbs
@@ -1,13 +1,24 @@
 import qbs.FileInfo
 import qbs.File
+import qbs.Utilities
 
 VTestApp {
     Depends { name: "buildconfig" }
     Depends { name: "Qt"; submodules: ["testlib", "gui", "printsupport"] }
     Depends { name: "VTestLib" }
-    Depends { name: "conan.XercesC"; condition: buildconfig.useConanPackages }
     Depends { name: "autotest" }
 
+    Depends {
+        name: "xerces-c"
+        condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 && !buildconfig.useConanPackages
+    }
+
+    Depends {
+        name: "conan.XercesC"
+        condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 && buildconfig.useConanPackages
+    }
+
+
     name: "CollectionTest"
     buildconfig.appTarget: qbs.targetOS.contains("macos") ? "CollectionTest" : "collectionTest"
     targetName: buildconfig.appTarget
diff --git a/src/test/TranslationsTest/TranslationsTest.qbs b/src/test/TranslationsTest/TranslationsTest.qbs
index cc32c2b88..fc63d9103 100644
--- a/src/test/TranslationsTest/TranslationsTest.qbs
+++ b/src/test/TranslationsTest/TranslationsTest.qbs
@@ -1,12 +1,22 @@
 import qbs.FileInfo
+import qbs.Utilities
 
 VTestApp {
     Depends { name: "buildconfig" }
     Depends { name: "VTestLib" }
     Depends { name: "Qt"; submodules: ["testlib", "xml", "gui", "printsupport"] }
-    Depends { name: "conan.XercesC"; condition: buildconfig.useConanPackages }
     Depends { name: "autotest" }
 
+    Depends {
+        name: "xerces-c"
+        condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 && !buildconfig.useConanPackages
+    }
+
+    Depends {
+        name: "conan.XercesC"
+        condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 && buildconfig.useConanPackages
+    }
+
     name: "TranslationsTest"
     buildconfig.appTarget: qbs.targetOS.contains("macos") ? "TranslationsTest" : "translationsTest"
     targetName: buildconfig.appTarget