windeployqt doesn't support key "--no-virtualkeyboard" since Qt 6.5.
This commit is contained in:
parent
49632e8f11
commit
11d1e4302d
|
@ -1,10 +1,15 @@
|
||||||
|
import qbs.Utilities
|
||||||
|
|
||||||
VLib {
|
VLib {
|
||||||
Depends { name: "windeployqt"; }
|
Depends { name: "windeployqt"; }
|
||||||
Depends { name: "i18nconfig"; }
|
Depends { name: "i18nconfig"; }
|
||||||
|
|
||||||
buildconfig.staticBuild: false
|
buildconfig.staticBuild: false
|
||||||
|
|
||||||
windeployqt.noVirtualkeyboard: true
|
Properties {
|
||||||
|
condition: qbs.targetOS.contains("windows") && Utilities.versionCompare(Qt.core.version, "6.5") < 0
|
||||||
|
windeployqt.noVirtualkeyboard: true
|
||||||
|
}
|
||||||
|
|
||||||
Properties {
|
Properties {
|
||||||
condition: qbs.targetOS.contains("macos")
|
condition: qbs.targetOS.contains("macos")
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import qbs.FileInfo
|
import qbs.FileInfo
|
||||||
import qbs.File
|
import qbs.File
|
||||||
|
import qbs.Utilities
|
||||||
|
|
||||||
VApp {
|
VApp {
|
||||||
Depends { name: "freedesktop2" }
|
Depends { name: "freedesktop2" }
|
||||||
|
@ -196,7 +197,7 @@ VApp {
|
||||||
}
|
}
|
||||||
|
|
||||||
Properties {
|
Properties {
|
||||||
condition: qbs.targetOS.contains("windows")
|
condition: qbs.targetOS.contains("windows") && Utilities.versionCompare(Qt.core.version, "6.5") < 0
|
||||||
windeployqt.noVirtualkeyboard: true
|
windeployqt.noVirtualkeyboard: true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -143,7 +143,7 @@ Module {
|
||||||
else if (product.windeployqt.noCompilerRuntime)
|
else if (product.windeployqt.noCompilerRuntime)
|
||||||
cmdArgs.push("--no-compiler-runtime")
|
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")
|
cmdArgs.push("--no-virtualkeyboard")
|
||||||
|
|
||||||
if (product.windeployqt.json)
|
if (product.windeployqt.json)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user