Make cpp.cxxLanguageVersion a list

... and choose the highest entry. This enables different modules to
specify their requirements without introducing conflicts.
Same for cpp.cLanguageVersion.

Task-number: QBS-1225
Change-Id: I96ed6c370eb190023fdb69274dcb080d967f512d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 7 insertions, 2 deletions

diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index ce6871c70..5ac936eb0 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -28,6 +28,7 @@
 **
 ****************************************************************************/
 
+var Cpp = require("cpp.js");
 var File = require("qbs.File");
 var FileInfo = require("qbs.FileInfo");
 var DarwinTools = require("qbs.DarwinTools");
@@ -866,10 +867,14 @@ function compilerFlags(project, product, input, output, explicitlyDependsOn) {
         switch (tag) {
         case "c":
         case "objc":
-            return input.cpp.cLanguageVersion;
+            var knownValues = ["c11", "c99", "c90", "c89"];
+            return Cpp.languageVersion(input.cpp.cLanguageVersion, knownValues, "C");
         case "cpp":
         case "objcpp":
-            return input.cpp.cxxLanguageVersion;
+            knownValues = ["c++20", "c++2a", "c++17", "c++1z",
+                           "c++14", "c++1y", "c++11", "c++0x",
+                           "c++03", "c++98"];
+            return Cpp.languageVersion(input.cpp.cxxLanguageVersion, knownValues, "C++");
         }
     }