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

windeployqt doesn't support key "--no-virtualkeyboard" since Qt 6.5.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-06-24 21:16:22 +03:00
parent 49632e8f11
commit 11d1e4302d
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qbs/imports/VDynamicLib.qbs
View File

@ -1,10 +1,15 @@
import qbs.Utilities
VLib {
Depends { name: "windeployqt"; }
Depends { name: "i18nconfig"; }
buildconfig.staticBuild: false
Properties {
condition: qbs.targetOS.contains("windows") && Utilities.versionCompare(Qt.core.version, "6.5") < 0
windeployqt.noVirtualkeyboard: true
}
Properties {
condition: qbs.targetOS.contains("macos")

3
qbs/imports/VToolApp.qbs
View File

@ -1,5 +1,6 @@
import qbs.FileInfo
import qbs.File
import qbs.Utilities
VApp {
Depends { name: "freedesktop2" }
@ -196,7 +197,7 @@ VApp {
}
Properties {
condition: qbs.targetOS.contains("windows")
condition: qbs.targetOS.contains("windows") && Utilities.versionCompare(Qt.core.version, "6.5") < 0
windeployqt.noVirtualkeyboard: true
}

2
qbs/modules/windeployqt/windeployqt.qbs
View File

@ -143,7 +143,7 @@ Module {
else if (product.windeployqt.noCompilerRuntime)
cmdArgs.push("--no-compiler-runtime")
if (product.windeployqt.noVirtualkeyboard)
if (product.windeployqt.noVirtualkeyboard && Utilities.versionCompare(Qt.core.version, "6.5") < 0)
cmdArgs.push("--no-virtualkeyboard")
if (product.windeployqt.json)