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

Change dependencies for Qt6.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-01-28 22:15:32 +02:00
parent d781c34ede
commit 3d51968601
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/valentina/valentina.qbs
View File

@ -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

14
src/libs/ifc/ifc.qbs
View File

@ -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",