diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-02-13 09:14:09 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-13 18:31:40 +0100 |
| commit | 6b2535ea15cdbdb2355416b604f072fc13ff36b2 (patch) | |
| tree | 4bf1560bab77c8b315850c5337ba31a0ea87b5f0 /configure.json | |
| parent | 54c2cebabdda0280b8443c6947b6fee02445e138 (diff) | |
| parent | 67491e2df5357706dbf88ddaf1f030ff095b4528 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
examples/widgets/graphicsview/boxes/scene.h
src/corelib/Qt5CoreMacros.cmake
src/corelib/Qt6CoreMacros.cmake
src/network/ssl/qsslsocket.cpp
src/network/ssl/qsslsocket.h
src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
src/testlib/CMakeLists.txt
src/testlib/.prev_CMakeLists.txt
tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp
Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.
Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152
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" }, { |