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.cmake | |
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.cmake')
-rw-r--r-- | configure.cmake | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/configure.cmake b/configure.cmake index 8950c7e310..36daadadad 100644 --- a/configure.cmake +++ b/configure.cmake @@ -15,7 +15,7 @@ qt_find_package(Libudev PROVIDED_TARGETS PkgConfig::Libudev) #### Tests -# c++14 +# cxx14 qt_config_compile_test(cxx14 LABEL "C++14 support" CODE @@ -38,7 +38,7 @@ int main(int argc, char **argv) CXX_STANDARD 14 ) -# c++17 +# cxx17 qt_config_compile_test(cxx17 LABEL "C++17 support" CODE @@ -65,7 +65,7 @@ std::visit([](const auto &) { return 1; }, v); CXX_STANDARD 17 ) -# c++2a +# cxx2a qt_config_compile_test(cxx2a LABEL "C++2a support" CODE @@ -398,9 +398,14 @@ qt_feature("coverage_trace_pc_guard" AUTODETECT OFF ) qt_feature_config("coverage_trace_pc_guard" QMAKE_PUBLIC_CONFIG) +qt_feature("coverage_source_based" + LABEL "source-based" + AUTODETECT OFF +) +qt_feature_config("coverage_source_based" QMAKE_PUBLIC_CONFIG) qt_feature("coverage" LABEL "Code Coverage Instrumentation" - CONDITION QT_FEATURE_coverage_trace_pc_guard + CONDITION QT_FEATURE_coverage_trace_pc_guard OR QT_FEATURE_coverage_source_based ) qt_feature_config("coverage" QMAKE_PUBLIC_CONFIG) qt_feature("plugin-manifests" |