diff --git a/qbs/imports/VDynamicLib.qbs b/qbs/imports/VDynamicLib.qbs index eea557564..1cba799d2 100644 --- a/qbs/imports/VDynamicLib.qbs +++ b/qbs/imports/VDynamicLib.qbs @@ -1,10 +1,15 @@ +import qbs.Utilities + VLib { Depends { name: "windeployqt"; } Depends { name: "i18nconfig"; } buildconfig.staticBuild: false - windeployqt.noVirtualkeyboard: true + Properties { + condition: qbs.targetOS.contains("windows") && Utilities.versionCompare(Qt.core.version, "6.5") < 0 + windeployqt.noVirtualkeyboard: true + } Properties { condition: qbs.targetOS.contains("macos") diff --git a/qbs/imports/VToolApp.qbs b/qbs/imports/VToolApp.qbs index a0ac95056..488b790a6 100644 --- a/qbs/imports/VToolApp.qbs +++ b/qbs/imports/VToolApp.qbs @@ -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 } diff --git a/qbs/modules/windeployqt/windeployqt.qbs b/qbs/modules/windeployqt/windeployqt.qbs index d87584ad6..8b6afe0c4 100644 --- a/qbs/modules/windeployqt/windeployqt.qbs +++ b/qbs/modules/windeployqt/windeployqt.qbs @@ -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)