aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'develop'

Browse Source 
Correction of build errors with MacOS Sonoma

See merge request smart-pattern/valentina!16
This commit is contained in:
Roman Telezhynskyi 2024-02-13 11:02:27 +00:00
commit 08b8023f3c
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/test/CollectionTest/CollectionTest.qbs
View File

@ -1,13 +1,24 @@
import qbs.FileInfo import qbs.FileInfo
import qbs.File import qbs.File
import qbs.Utilities
VTestApp { VTestApp {
Depends { name: "buildconfig" } Depends { name: "buildconfig" }
Depends { name: "Qt"; submodules: ["testlib", "gui", "printsupport"] } Depends { name: "Qt"; submodules: ["testlib", "gui", "printsupport"] }
Depends { name: "VTestLib" } Depends { name: "VTestLib" }
Depends { name: "conan.XercesC"; condition: buildconfig.useConanPackages }
Depends { name: "autotest" } 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" name: "CollectionTest"
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "CollectionTest" : "collectionTest" buildconfig.appTarget: qbs.targetOS.contains("macos") ? "CollectionTest" : "collectionTest"
targetName: buildconfig.appTarget targetName: buildconfig.appTarget

12
src/test/TranslationsTest/TranslationsTest.qbs
View File

@ -1,12 +1,22 @@
import qbs.FileInfo import qbs.FileInfo
import qbs.Utilities
VTestApp { VTestApp {
Depends { name: "buildconfig" } Depends { name: "buildconfig" }
Depends { name: "VTestLib" } Depends { name: "VTestLib" }
Depends { name: "Qt"; submodules: ["testlib", "xml", "gui", "printsupport"] } Depends { name: "Qt"; submodules: ["testlib", "xml", "gui", "printsupport"] }
Depends { name: "conan.XercesC"; condition: buildconfig.useConanPackages }
Depends { name: "autotest" } 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" name: "TranslationsTest"
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "TranslationsTest" : "translationsTest" buildconfig.appTarget: qbs.targetOS.contains("macos") ? "TranslationsTest" : "translationsTest"
targetName: buildconfig.appTarget targetName: buildconfig.appTarget