diff options
Diffstat (limited to 'configure.json')
-rw-r--r-- | configure.json | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/configure.json b/configure.json index 1699f69ca4..d11fa18bf1 100644 --- a/configure.json +++ b/configure.json @@ -321,7 +321,7 @@ "qmake": "CONFIG += c11" } }, - "c++14": { + "cxx14": { "label": "C++14 support", "type": "compile", "test": { @@ -335,7 +335,7 @@ "qmake": "CONFIG += c++11 c++14" } }, - "c++17": { + "cxx17": { "label": "C++17 support", "type": "compile", "test": { @@ -356,7 +356,7 @@ "qmake": "CONFIG += c++11 c++14 c++17" } }, - "c++2a": { + "cxx2a": { "label": "C++2a support", "type": "compile", "test": { @@ -915,9 +915,14 @@ "autoDetect": false, "output": [ "publicConfig" ] }, + "coverage_source_based": { + "label": "source-based", + "autoDetect": false, + "output": [ "publicConfig" ] + }, "coverage": { "label": "Code Coverage Instrumentation", - "condition": "features.coverage_trace_pc_guard", + "condition": "features.coverage_trace_pc_guard || features.coverage_source_based", "output": [ "publicConfig" ] }, "GNUmake": { @@ -957,12 +962,12 @@ }, "c++14": { "label": "C++14", - "condition": "features.c++11 && tests.c++14", + "condition": "features.c++11 && tests.cxx14", "output": [ "publicFeature", "publicQtConfig" ] }, "c++17": { "label": "C++17", - "condition": "features.c++14 && tests.c++17", + "condition": "features.c++14 && tests.cxx17", "output": [ "publicFeature", "publicQtConfig" ] }, "c++1z": { @@ -973,7 +978,7 @@ "c++2a": { "label": "C++2a", "autoDetect": false, - "condition": "features.c++17 && tests.c++2a", + "condition": "features.c++17 && tests.cxx2a", "output": [ "publicFeature", "publicQtConfig" ] }, "c89": { @@ -1606,7 +1611,7 @@ { "message": "Code Coverage Instrumentation", "type": "firstAvailableFeature", - "args": "coverage_trace_pc_guard", + "args": "coverage_trace_pc_guard coverage_source_based", "condition": "features.coverage" }, { |