From c89544fe08649680414ef61c62765b2562bacdcf Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Tue, 28 Feb 2023 10:45:58 +0200
Subject: [PATCH] Start building with C++20 since Qt 6.0

---
 qbs/modules/buildconfig/buildconfig.qbs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/qbs/modules/buildconfig/buildconfig.qbs b/qbs/modules/buildconfig/buildconfig.qbs
index a3cad02f0..b3f38a790 100644
--- a/qbs/modules/buildconfig/buildconfig.qbs
+++ b/qbs/modules/buildconfig/buildconfig.qbs
@@ -138,14 +138,12 @@ Module {
 
     cpp.visibility: "minimal"
 
-    Properties {
-        condition: Qt.core.versionMajor >= 5 &&  Qt.core.versionMinor < 12
-        cpp.cxxLanguageVersion: "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"
+    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";
     }
 
     readonly property string minimumMacosVersion: {