diff --git a/src/app/valentina/valentina.qbs b/src/app/valentina/valentina.qbs index 949ea417e..505e0180f 100644 --- a/src/app/valentina/valentina.qbs +++ b/src/app/valentina/valentina.qbs @@ -1,9 +1,10 @@ import qbs.FileInfo +import qbs.Utilities VToolApp { Depends { name: "buildconfig" } Depends { name: "ib"; condition: qbs.targetOS.contains("macos") } - Depends { name: "Qt"; submodules: ["widgets", "svg", "xmlpatterns", "concurrent"] } + Depends { name: "Qt"; submodules: ["core", "widgets", "svg", "concurrent"] } Depends { name: "VPatternDBLib"; } Depends { name: "VWidgetsLib"; } Depends { name: "FervorLib"; } @@ -13,7 +14,15 @@ VToolApp { Depends { name: "VFormatLib"; } Depends { name: "VMiscLib"; } - primaryApp: true + Depends { + name: "Qt.xmlpatterns" + condition: Utilities.versionCompare(Qt.core.version, "6") < 0 + } + + Depends { + name: "Qt.core5compat"; + condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 + } Depends { name: "Qt.winextras" @@ -22,6 +31,8 @@ VToolApp { required: false } + primaryApp: true + name: "Valentina" buildconfig.appTarget: qbs.targetOS.contains("macos") ? "Valentina" : "valentina" targetName: buildconfig.appTarget diff --git a/src/libs/ifc/ifc.qbs b/src/libs/ifc/ifc.qbs index 76b79c458..8288330e3 100644 --- a/src/libs/ifc/ifc.qbs +++ b/src/libs/ifc/ifc.qbs @@ -1,7 +1,19 @@ +import qbs.Utilities + VLib { - Depends { name: "Qt"; submodules: ["gui", "xml", "svg", "xmlpatterns", "concurrent"] } + Depends { name: "Qt"; submodules: ["core", "gui", "xml", "svg", "concurrent"] } Depends { name: "VMiscLib" } + Depends { + name: "Qt.xmlpatterns" + condition: Utilities.versionCompare(Qt.core.version, "6") < 0 + } + + Depends { + name: "Qt.core5compat"; + condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 + } + name: "IFCLib" files: [ "ifcdef.h",