diff --git a/qbs/imports/VDynamicLib.qbs b/qbs/imports/VDynamicLib.qbs
index dda61d17d..a1502f283 100644
--- a/qbs/imports/VDynamicLib.qbs
+++ b/qbs/imports/VDynamicLib.qbs
@@ -1,7 +1,7 @@
 import qbs.Utilities
 
 VLib {
-    Depends { name: "windeployqt"; }
+    Depends { name: "windeployqt"; condition: qbs.targetOS.contains("windows") }
     Depends { name: "i18nconfig"; }
 
     buildconfig.staticBuild: false
@@ -28,7 +28,7 @@ VLib {
     }
 
     Properties {
-        condition: i18nconfig.limitDeploymentOfQtTranslations
+        condition: qbs.targetOS.contains("windows") && i18nconfig.limitDeploymentOfQtTranslations
         windeployqt.languages: i18nconfig.qtTranslationLocales.join(',')
     }
 
diff --git a/qbs/modules/windeployqt/windeployqt.qbs b/qbs/modules/windeployqt/windeployqt.qbs
index 316275c83..438b651df 100644
--- a/qbs/modules/windeployqt/windeployqt.qbs
+++ b/qbs/modules/windeployqt/windeployqt.qbs
@@ -145,7 +145,8 @@ Module {
 
                 if (product.windeployqt.compilerRuntime)
                     cmdArgs.push("--compiler-runtime")
-                else if (product.windeployqt.noCompilerRuntime)
+
+                if (product.windeployqt.noCompilerRuntime)
                     cmdArgs.push("--no-compiler-runtime")
 
                 if (product.windeployqt.noVirtualkeyboard &&