diff --git a/qbs/imports/VApp.qbs b/qbs/imports/VApp.qbs
index ee6d54689..d316c8ff7 100644
--- a/qbs/imports/VApp.qbs
+++ b/qbs/imports/VApp.qbs
@@ -24,15 +24,25 @@ CppApplication {
         cpp.compilerWrapper: "ccache"
     }
 
-    Properties {
-        condition: Qt.core.versionMajor >= 5 && Qt.core.versionMinor < 12
-        cpp.cxxLanguageVersion: "c++11"
+    cpp.cxxLanguageVersion: {
+        if (Qt.core.versionMajor >= 6) // Start building with C++20 since Qt 6.0
+            return "c++20";
+        else if(Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 12) // Since Qt 5.12 available support for C++17
+            return "c++17";
+        return "c++11";
     }
 
-    // Since Qt 5.12 available support for C++17
     Properties {
-        condition: Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 12
-        cpp.cxxLanguageVersion: "c++17"
+        condition: qbs.targetOS.contains("windows") && qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang")
+        cpp.minimumWindowsVersion: {
+            if (Qt.core.versionMajor >= 6)
+                return "6.02"; // should be 10.0
+
+            if (Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 7)
+                return "6.00";
+
+            return "5.01";
+        }
     }
 
     Group {
diff --git a/qbs/imports/VLib.qbs b/qbs/imports/VLib.qbs
index e059b6028..6340ba1bf 100644
--- a/qbs/imports/VLib.qbs
+++ b/qbs/imports/VLib.qbs
@@ -23,6 +23,27 @@ Library {
         cpp.compilerWrapper: "ccache"
     }
 
+    cpp.cxxLanguageVersion: {
+        if (Qt.core.versionMajor >= 6) // Start building with C++20 since Qt 6.0
+            return "c++20";
+        else if(Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 12) // Since Qt 5.12 available support for C++17
+            return "c++17";
+        return "c++11";
+    }
+
+    Properties {
+        condition: qbs.targetOS.contains("windows") && qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang")
+        cpp.minimumWindowsVersion: {
+            if (Qt.core.versionMajor >= 6)
+                return "6.02"; // should be 10.0
+
+            if (Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 7)
+                return "6.00";
+
+            return "5.01";
+        }
+    }
+
     install: false
     installDebugInformation: false
 
diff --git a/qbs/modules/buildconfig/buildconfig.qbs b/qbs/modules/buildconfig/buildconfig.qbs
index b656ed100..9311e1f91 100644
--- a/qbs/modules/buildconfig/buildconfig.qbs
+++ b/qbs/modules/buildconfig/buildconfig.qbs
@@ -134,27 +134,6 @@ Module {
 
     cpp.visibility: "minimal"
 
-    cpp.cxxLanguageVersion: {
-        if (Qt.core.versionMajor >= 6) // Start building with C++20 since Qt 6.0
-            return "c++20";
-        else if(Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 12) // Since Qt 5.12 available support for C++17
-            return "c++17";
-        return "c++11";
-    }
-
-    Properties {
-        condition: qbs.targetOS.contains("windows") && qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang")
-        cpp.minimumWindowsVersion: {
-            if (Qt.core.versionMajor >= 6)
-                return "6.02"; // should be 10.0
-
-            if (Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 7)
-                return "6.00";
-
-            return "5.01";
-        }
-    }
-
     readonly property string minimumMacosVersion: {
         if (project.minimumMacosVersion !== undefined)
             return project.minimumMacosVersion;