From 0da123d67b0fd332691f98ae6957ef05e9e20e84 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 22 Sep 2021 15:11:47 +0200 Subject: [PATCH] CMake: Bump almost all cmake_minimum_required calls to 3.16 Needed for subsequent change that will check and error out if the version is lower than 3.16. We do that to ensure all policies introduced by CMake up to version 3.16 have their behavior set to NEW. Pick-to: 6.2 Task-number: QTBUG-95018 Change-Id: Ieaf82c10987dd797d86a3fd4a986a67e72de486a Reviewed-by: Kai Koehne --- cmake/QtWriteArgsFile.cmake | 2 +- cmake/tests/features/CMakeLists.txt | 2 +- cmake/tests/qt_make_output_file/CMakeLists.txt | 2 +- config.tests/arch/CMakeLists.txt | 2 +- config.tests/precompile_header/CMakeLists.txt | 2 +- config.tests/separate_debug_info/CMakeLists.txt | 2 +- config.tests/static_link_order/CMakeLists.txt | 2 +- config.tests/x86_simd/CMakeLists.txt | 2 +- src/corelib/Qt6CTestMacros.cmake | 4 ++-- src/network/doc/snippets/CMakeLists.txt | 2 +- tests/auto/cmake/CMakeLists.txt | 2 +- tests/auto/cmake/mockplugins/CMakeLists.txt | 2 +- tests/auto/cmake/test(needsquoting)dirname/CMakeLists.txt | 2 +- tests/auto/cmake/test_QFINDTESTDATA/CMakeLists.txt | 2 +- tests/auto/cmake/test_QTBUG-63422/CMakeLists.txt | 2 +- tests/auto/cmake/test_QT_TESTCASE_BUILDDIR/CMakeLists.txt | 2 +- tests/auto/cmake/test_add_big_resource/CMakeLists.txt | 2 +- .../test_add_binary_resources_delayed_file/CMakeLists.txt | 2 +- tests/auto/cmake/test_add_resource_options/CMakeLists.txt | 2 +- .../cmake/test_add_resources_binary_generated/CMakeLists.txt | 2 +- .../auto/cmake/test_add_resources_delayed_file/CMakeLists.txt | 2 +- tests/auto/cmake/test_concurrent_module/CMakeLists.txt | 2 +- tests/auto/cmake/test_dbus_module/CMakeLists.txt | 2 +- tests/auto/cmake/test_dependent_modules/CMakeLists.txt | 2 +- tests/auto/cmake/test_generating_cpp_exports/CMakeLists.txt | 2 +- tests/auto/cmake/test_global_promotion/CMakeLists.txt | 2 +- tests/auto/cmake/test_import_plugins/CMakeLists.txt | 2 +- tests/auto/cmake/test_interface/CMakeLists.txt | 2 +- tests/auto/cmake/test_interface/widget_test/CMakeLists.txt | 2 +- tests/auto/cmake/test_interface_link_libraries/CMakeLists.txt | 2 +- tests/auto/cmake/test_json_plugin_includes/CMakeLists.txt | 2 +- tests/auto/cmake/test_moc_macro_target/CMakeLists.txt | 2 +- tests/auto/cmake/test_multiple_find_package/CMakeLists.txt | 2 +- tests/auto/cmake/test_opengl_lib/CMakeLists.txt | 2 +- tests/auto/cmake/test_platform_defs_include/CMakeLists.txt | 2 +- .../cmake/test_plugin_shared_static_flavor/CMakeLists.txt | 2 +- tests/auto/cmake/test_plugins/CMakeLists.txt | 2 +- tests/auto/cmake/test_private_includes/CMakeLists.txt | 2 +- tests/auto/cmake/test_private_targets/CMakeLists.txt | 2 +- tests/auto/cmake/test_qtmainwin_library/CMakeLists.txt | 2 +- tests/auto/cmake/test_static_resources/CMakeLists.txt | 2 +- tests/auto/cmake/test_testlib_definitions/CMakeLists.txt | 2 +- tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt | 2 +- tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt | 2 +- tests/auto/cmake/test_umbrella_config/CMakeLists.txt | 2 +- tests/auto/cmake/test_versionless_targets/CMakeLists.txt | 2 +- tests/auto/cmake/test_wrap_cpp_and_resources/CMakeLists.txt | 2 +- tests/auto/cmake/test_wrap_cpp_options/CMakeLists.txt | 2 +- .../serialization/qcborstreamreader/next/CMakeLists.txt | 2 +- .../corelib/serialization/qcborvalue/fromcbor/CMakeLists.txt | 2 +- .../qtextstream/extractionoperator-float/CMakeLists.txt | 2 +- .../qxmlstream/qxmlstreamreader/readnext/CMakeLists.txt | 2 +- .../corelib/text/qregularexpression/optimize/CMakeLists.txt | 2 +- .../corelib/time/qdatetime/fromstring/CMakeLists.txt | 2 +- .../corelib/tools/qcryptographichash/result/CMakeLists.txt | 2 +- tests/libfuzzer/gui/image/qimage/loadfromdata/CMakeLists.txt | 2 +- .../gui/painting/qcolorspace/fromiccprofile/CMakeLists.txt | 2 +- tests/libfuzzer/gui/text/qtextdocument/sethtml/CMakeLists.txt | 2 +- .../gui/text/qtextdocument/setmarkdown/CMakeLists.txt | 2 +- .../libfuzzer/gui/text/qtextlayout/beginlayout/CMakeLists.txt | 2 +- .../ssl/qsslcertificate/qsslcertificate/pem/CMakeLists.txt | 2 +- tests/manual/highdpi/dprgadget/CMakeLists.txt | 2 +- tests/manual/highdpi/pixelgadget/CMakeLists.txt | 2 +- tests/manual/highdpi/screengadget/CMakeLists.txt | 2 +- util/cmake/pro2cmake.py | 2 +- 65 files changed, 66 insertions(+), 66 deletions(-) diff --git a/cmake/QtWriteArgsFile.cmake b/cmake/QtWriteArgsFile.cmake index d21d050ed44..666806ffcc1 100644 --- a/cmake/QtWriteArgsFile.cmake +++ b/cmake/QtWriteArgsFile.cmake @@ -8,7 +8,7 @@ # SKIP_ARGS: Number of arguments to skip from the front of the arguments list. # IGNORE_ARGS: List of arguments to be ignored, i.e. that are not written. -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.16) # Read arguments from IN_FILE and separate them. file(READ "${IN_FILE}" raw_args) diff --git a/cmake/tests/features/CMakeLists.txt b/cmake/tests/features/CMakeLists.txt index 0fff2b8be98..8fe611b8354 100644 --- a/cmake/tests/features/CMakeLists.txt +++ b/cmake/tests/features/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.12.0) +cmake_minimum_required(VERSION 3.16) project(FeaturesTest VERSION 1.0.0 diff --git a/cmake/tests/qt_make_output_file/CMakeLists.txt b/cmake/tests/qt_make_output_file/CMakeLists.txt index 36209094944..ad1162e538b 100644 --- a/cmake/tests/qt_make_output_file/CMakeLists.txt +++ b/cmake/tests/qt_make_output_file/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.12.0) +cmake_minimum_required(VERSION 3.16) project(QtMakeOutputFileTest VERSION 1.0.0 diff --git a/config.tests/arch/CMakeLists.txt b/config.tests/arch/CMakeLists.txt index c0873a984f5..2e11f20674c 100644 --- a/config.tests/arch/CMakeLists.txt +++ b/config.tests/arch/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15.0) +cmake_minimum_required(VERSION 3.16) project(arch LANGUAGES CXX) add_executable(architecture_test) diff --git a/config.tests/precompile_header/CMakeLists.txt b/config.tests/precompile_header/CMakeLists.txt index 40f9e3da81c..3009eafd191 100644 --- a/config.tests/precompile_header/CMakeLists.txt +++ b/config.tests/precompile_header/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15.0) +cmake_minimum_required(VERSION 3.16) project(precompile_header LANGUAGES CXX) add_executable(precompile_header main.cpp) diff --git a/config.tests/separate_debug_info/CMakeLists.txt b/config.tests/separate_debug_info/CMakeLists.txt index 1b98c0dab0c..94b90f08d20 100644 --- a/config.tests/separate_debug_info/CMakeLists.txt +++ b/config.tests/separate_debug_info/CMakeLists.txt @@ -1,5 +1,5 @@ # special case skip regeneration -cmake_minimum_required(VERSION 3.14.0) +cmake_minimum_required(VERSION 3.16) project(objcopytest LANGUAGES CXX) include(CMakeFindBinUtils) add_executable(objcopytest main.cpp) diff --git a/config.tests/static_link_order/CMakeLists.txt b/config.tests/static_link_order/CMakeLists.txt index 36ce10e87cd..b3c122c300e 100644 --- a/config.tests/static_link_order/CMakeLists.txt +++ b/config.tests/static_link_order/CMakeLists.txt @@ -7,7 +7,7 @@ # staticlib2.cpp.o. # # For now it's only applicable for ld-like linkers. 'lld' has no such issue. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(static_link_order_test LANGUAGES CXX) diff --git a/config.tests/x86_simd/CMakeLists.txt b/config.tests/x86_simd/CMakeLists.txt index b624b7bc959..d70f9b54e04 100644 --- a/config.tests/x86_simd/CMakeLists.txt +++ b/config.tests/x86_simd/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14.0) +cmake_minimum_required(VERSION 3.16) project(x86_simd LANGUAGES CXX) include(../../cmake/QtPlatformSupport.cmake) diff --git a/src/corelib/Qt6CTestMacros.cmake b/src/corelib/Qt6CTestMacros.cmake index 19601c5dec6..8b4e5c6e4be 100644 --- a/src/corelib/Qt6CTestMacros.cmake +++ b/src/corelib/Qt6CTestMacros.cmake @@ -372,7 +372,7 @@ list(APPEND CMAKE_PREFIX_PATH \"${CMAKE_PREFIX_PATH}\") file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/failbuild/${_dir}/CMakeLists.txt" " - cmake_minimum_required(VERSION 3.14) + cmake_minimum_required(VERSION 3.16) project(${_dir}) try_compile(Result \${CMAKE_CURRENT_BINARY_DIR}/${_dir} @@ -446,7 +446,7 @@ function(_qt_internal_test_module_includes) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/module_includes/CMakeLists.txt" " - cmake_minimum_required(VERSION 3.14) + cmake_minimum_required(VERSION 3.16) project(module_includes) ${packages_string} diff --git a/src/network/doc/snippets/CMakeLists.txt b/src/network/doc/snippets/CMakeLists.txt index 2ae4c75a1b9..51289433313 100644 --- a/src/network/doc/snippets/CMakeLists.txt +++ b/src/network/doc/snippets/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.0) +cmake_minimum_required(VERSION 3.16) project(network_cppsnippets) diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 967c21e2d60..dfbbb19828f 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -40,7 +40,7 @@ # needs to be set to the installation prefix or build prefix of Qt # before running these tests. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(cmake_usage_tests) diff --git a/tests/auto/cmake/mockplugins/CMakeLists.txt b/tests/auto/cmake/mockplugins/CMakeLists.txt index 5b72184b0fb..7f61b562bc3 100644 --- a/tests/auto/cmake/mockplugins/CMakeLists.txt +++ b/tests/auto/cmake/mockplugins/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from qtsvg.pro. -cmake_minimum_required(VERSION 3.15.0) +cmake_minimum_required(VERSION 3.16) include(.cmake.conf) project(QtMockPlugins diff --git a/tests/auto/cmake/test(needsquoting)dirname/CMakeLists.txt b/tests/auto/cmake/test(needsquoting)dirname/CMakeLists.txt index d9aaf18f149..c2a575af654 100644 --- a/tests/auto/cmake/test(needsquoting)dirname/CMakeLists.txt +++ b/tests/auto/cmake/test(needsquoting)dirname/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project("test(needsquoting)dirname") diff --git a/tests/auto/cmake/test_QFINDTESTDATA/CMakeLists.txt b/tests/auto/cmake/test_QFINDTESTDATA/CMakeLists.txt index c14ebb63756..b67ff560e4a 100644 --- a/tests/auto/cmake/test_QFINDTESTDATA/CMakeLists.txt +++ b/tests/auto/cmake/test_QFINDTESTDATA/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_QFINDTESTDATA) diff --git a/tests/auto/cmake/test_QTBUG-63422/CMakeLists.txt b/tests/auto/cmake/test_QTBUG-63422/CMakeLists.txt index d4effa63055..a256cfc0679 100644 --- a/tests/auto/cmake/test_QTBUG-63422/CMakeLists.txt +++ b/tests/auto/cmake/test_QTBUG-63422/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) if(POLICY CMP0099) cmake_policy(SET CMP0099 NEW) # Avoid CMP0099 related warnings. endif() diff --git a/tests/auto/cmake/test_QT_TESTCASE_BUILDDIR/CMakeLists.txt b/tests/auto/cmake/test_QT_TESTCASE_BUILDDIR/CMakeLists.txt index f6fe597def5..92ce28a5b91 100644 --- a/tests/auto/cmake/test_QT_TESTCASE_BUILDDIR/CMakeLists.txt +++ b/tests/auto/cmake/test_QT_TESTCASE_BUILDDIR/CMakeLists.txt @@ -1,6 +1,6 @@ # The test is simply testing that manual specification of QT_TESTCASE_BUILDDIR works, # despite the weird paths. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_qt_testcase_builddir) diff --git a/tests/auto/cmake/test_add_big_resource/CMakeLists.txt b/tests/auto/cmake/test_add_big_resource/CMakeLists.txt index 59e57059259..b712f5a23db 100644 --- a/tests/auto/cmake/test_add_big_resource/CMakeLists.txt +++ b/tests/auto/cmake/test_add_big_resource/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_add_big_resource) diff --git a/tests/auto/cmake/test_add_binary_resources_delayed_file/CMakeLists.txt b/tests/auto/cmake/test_add_binary_resources_delayed_file/CMakeLists.txt index 6077139e083..1ca2c0940af 100644 --- a/tests/auto/cmake/test_add_binary_resources_delayed_file/CMakeLists.txt +++ b/tests/auto/cmake/test_add_binary_resources_delayed_file/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_add_binary_resources_delayed_file) diff --git a/tests/auto/cmake/test_add_resource_options/CMakeLists.txt b/tests/auto/cmake/test_add_resource_options/CMakeLists.txt index 148dbec462d..4692cdbdc68 100644 --- a/tests/auto/cmake/test_add_resource_options/CMakeLists.txt +++ b/tests/auto/cmake/test_add_resource_options/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_add_resource_options) diff --git a/tests/auto/cmake/test_add_resources_binary_generated/CMakeLists.txt b/tests/auto/cmake/test_add_resources_binary_generated/CMakeLists.txt index a764e68cc74..2d5a399a0cd 100644 --- a/tests/auto/cmake/test_add_resources_binary_generated/CMakeLists.txt +++ b/tests/auto/cmake/test_add_resources_binary_generated/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_add_resources_binary_generated) diff --git a/tests/auto/cmake/test_add_resources_delayed_file/CMakeLists.txt b/tests/auto/cmake/test_add_resources_delayed_file/CMakeLists.txt index e62f16d4c13..49bc5cbb2be 100644 --- a/tests/auto/cmake/test_add_resources_delayed_file/CMakeLists.txt +++ b/tests/auto/cmake/test_add_resources_delayed_file/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_add_resources_delayed_file) diff --git a/tests/auto/cmake/test_concurrent_module/CMakeLists.txt b/tests/auto/cmake/test_concurrent_module/CMakeLists.txt index 621499808ea..3294535319c 100644 --- a/tests/auto/cmake/test_concurrent_module/CMakeLists.txt +++ b/tests/auto/cmake/test_concurrent_module/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_concurrent_module) diff --git a/tests/auto/cmake/test_dbus_module/CMakeLists.txt b/tests/auto/cmake/test_dbus_module/CMakeLists.txt index 2698d9fcc81..6159456197e 100644 --- a/tests/auto/cmake/test_dbus_module/CMakeLists.txt +++ b/tests/auto/cmake/test_dbus_module/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_dbus_module) diff --git a/tests/auto/cmake/test_dependent_modules/CMakeLists.txt b/tests/auto/cmake/test_dependent_modules/CMakeLists.txt index 3f5e7974a68..679f7fed27c 100644 --- a/tests/auto/cmake/test_dependent_modules/CMakeLists.txt +++ b/tests/auto/cmake/test_dependent_modules/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_dependent_modules) diff --git a/tests/auto/cmake/test_generating_cpp_exports/CMakeLists.txt b/tests/auto/cmake/test_generating_cpp_exports/CMakeLists.txt index f01f5bb8f1e..7b5666c3f71 100644 --- a/tests/auto/cmake/test_generating_cpp_exports/CMakeLists.txt +++ b/tests/auto/cmake/test_generating_cpp_exports/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15.0) +cmake_minimum_required(VERSION 3.16) include(.cmake.conf) diff --git a/tests/auto/cmake/test_global_promotion/CMakeLists.txt b/tests/auto/cmake/test_global_promotion/CMakeLists.txt index c59dece81e6..1ad6c5e7ad1 100644 --- a/tests/auto/cmake/test_global_promotion/CMakeLists.txt +++ b/tests/auto/cmake/test_global_promotion/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(global_promotion) diff --git a/tests/auto/cmake/test_import_plugins/CMakeLists.txt b/tests/auto/cmake/test_import_plugins/CMakeLists.txt index 044805a85a9..be85af2091b 100644 --- a/tests/auto/cmake/test_import_plugins/CMakeLists.txt +++ b/tests/auto/cmake/test_import_plugins/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.16) project(import_plugins_advanced) enable_testing() diff --git a/tests/auto/cmake/test_interface/CMakeLists.txt b/tests/auto/cmake/test_interface/CMakeLists.txt index d874ac561d7..22e9a0b3acf 100644 --- a/tests/auto/cmake/test_interface/CMakeLists.txt +++ b/tests/auto/cmake/test_interface/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_interface) diff --git a/tests/auto/cmake/test_interface/widget_test/CMakeLists.txt b/tests/auto/cmake/test_interface/widget_test/CMakeLists.txt index 679d01ef638..229b1bf9621 100644 --- a/tests/auto/cmake/test_interface/widget_test/CMakeLists.txt +++ b/tests/auto/cmake/test_interface/widget_test/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_interface_try_compile) diff --git a/tests/auto/cmake/test_interface_link_libraries/CMakeLists.txt b/tests/auto/cmake/test_interface_link_libraries/CMakeLists.txt index 5853a6bcab8..28f8b9aefef 100644 --- a/tests/auto/cmake/test_interface_link_libraries/CMakeLists.txt +++ b/tests/auto/cmake/test_interface_link_libraries/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_interface_link_libraries) diff --git a/tests/auto/cmake/test_json_plugin_includes/CMakeLists.txt b/tests/auto/cmake/test_json_plugin_includes/CMakeLists.txt index d1b03cfc707..0f5dc992066 100644 --- a/tests/auto/cmake/test_json_plugin_includes/CMakeLists.txt +++ b/tests/auto/cmake/test_json_plugin_includes/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_json_plugin_includes) diff --git a/tests/auto/cmake/test_moc_macro_target/CMakeLists.txt b/tests/auto/cmake/test_moc_macro_target/CMakeLists.txt index ed765ee71c5..eaf8bda1bb8 100644 --- a/tests/auto/cmake/test_moc_macro_target/CMakeLists.txt +++ b/tests/auto/cmake/test_moc_macro_target/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_moc_macro_target) diff --git a/tests/auto/cmake/test_multiple_find_package/CMakeLists.txt b/tests/auto/cmake/test_multiple_find_package/CMakeLists.txt index adf7de5640d..48864f2b22c 100644 --- a/tests/auto/cmake/test_multiple_find_package/CMakeLists.txt +++ b/tests/auto/cmake/test_multiple_find_package/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_multiple_find_package) diff --git a/tests/auto/cmake/test_opengl_lib/CMakeLists.txt b/tests/auto/cmake/test_opengl_lib/CMakeLists.txt index 0fef37da3d2..020d7fbf2ad 100644 --- a/tests/auto/cmake/test_opengl_lib/CMakeLists.txt +++ b/tests/auto/cmake/test_opengl_lib/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_opengl_lib) diff --git a/tests/auto/cmake/test_platform_defs_include/CMakeLists.txt b/tests/auto/cmake/test_platform_defs_include/CMakeLists.txt index 110ae472da0..34a22b056ad 100644 --- a/tests/auto/cmake/test_platform_defs_include/CMakeLists.txt +++ b/tests/auto/cmake/test_platform_defs_include/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_platform_defs_include) diff --git a/tests/auto/cmake/test_plugin_shared_static_flavor/CMakeLists.txt b/tests/auto/cmake/test_plugin_shared_static_flavor/CMakeLists.txt index 12d7affc516..0a79038e8a3 100644 --- a/tests/auto/cmake/test_plugin_shared_static_flavor/CMakeLists.txt +++ b/tests/auto/cmake/test_plugin_shared_static_flavor/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_plugin_flavor) diff --git a/tests/auto/cmake/test_plugins/CMakeLists.txt b/tests/auto/cmake/test_plugins/CMakeLists.txt index b571be4954c..9870db9ce4e 100644 --- a/tests/auto/cmake/test_plugins/CMakeLists.txt +++ b/tests/auto/cmake/test_plugins/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_plugins) diff --git a/tests/auto/cmake/test_private_includes/CMakeLists.txt b/tests/auto/cmake/test_private_includes/CMakeLists.txt index 6ad27832d22..402ae73def0 100644 --- a/tests/auto/cmake/test_private_includes/CMakeLists.txt +++ b/tests/auto/cmake/test_private_includes/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_private_includes) diff --git a/tests/auto/cmake/test_private_targets/CMakeLists.txt b/tests/auto/cmake/test_private_targets/CMakeLists.txt index bec103cb879..f703b7af20f 100644 --- a/tests/auto/cmake/test_private_targets/CMakeLists.txt +++ b/tests/auto/cmake/test_private_targets/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_private_targets) diff --git a/tests/auto/cmake/test_qtmainwin_library/CMakeLists.txt b/tests/auto/cmake/test_qtmainwin_library/CMakeLists.txt index b4f3a102e22..387fbd81f7b 100644 --- a/tests/auto/cmake/test_qtmainwin_library/CMakeLists.txt +++ b/tests/auto/cmake/test_qtmainwin_library/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_qtmainwin_library) diff --git a/tests/auto/cmake/test_static_resources/CMakeLists.txt b/tests/auto/cmake/test_static_resources/CMakeLists.txt index 840a49e614c..b159f43b78c 100644 --- a/tests/auto/cmake/test_static_resources/CMakeLists.txt +++ b/tests/auto/cmake/test_static_resources/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15.0) +cmake_minimum_required(VERSION 3.16) include(.cmake.conf) diff --git a/tests/auto/cmake/test_testlib_definitions/CMakeLists.txt b/tests/auto/cmake/test_testlib_definitions/CMakeLists.txt index e6f2ad1caed..b6ac6434e86 100644 --- a/tests/auto/cmake/test_testlib_definitions/CMakeLists.txt +++ b/tests/auto/cmake/test_testlib_definitions/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_testlib_definitions) diff --git a/tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt b/tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt index ef552cacc6e..cc126ab87f3 100644 --- a/tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt +++ b/tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(no_link_gui) diff --git a/tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt b/tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt index ed9a8707daa..b88ad60d449 100644 --- a/tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt +++ b/tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(no_link_widgets) diff --git a/tests/auto/cmake/test_umbrella_config/CMakeLists.txt b/tests/auto/cmake/test_umbrella_config/CMakeLists.txt index cfe809c0849..a7c31971fb3 100644 --- a/tests/auto/cmake/test_umbrella_config/CMakeLists.txt +++ b/tests/auto/cmake/test_umbrella_config/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_umbrella_config) diff --git a/tests/auto/cmake/test_versionless_targets/CMakeLists.txt b/tests/auto/cmake/test_versionless_targets/CMakeLists.txt index c670f5b26d1..278586fb1d6 100644 --- a/tests/auto/cmake/test_versionless_targets/CMakeLists.txt +++ b/tests/auto/cmake/test_versionless_targets/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(versionless_targets) diff --git a/tests/auto/cmake/test_wrap_cpp_and_resources/CMakeLists.txt b/tests/auto/cmake/test_wrap_cpp_and_resources/CMakeLists.txt index 3e026db7376..8452bf8c918 100644 --- a/tests/auto/cmake/test_wrap_cpp_and_resources/CMakeLists.txt +++ b/tests/auto/cmake/test_wrap_cpp_and_resources/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_wrap_cpp_and_resources) diff --git a/tests/auto/cmake/test_wrap_cpp_options/CMakeLists.txt b/tests/auto/cmake/test_wrap_cpp_options/CMakeLists.txt index e6e972e852e..17f8fd7a48a 100644 --- a/tests/auto/cmake/test_wrap_cpp_options/CMakeLists.txt +++ b/tests/auto/cmake/test_wrap_cpp_options/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(test_wrap_cpp_options) diff --git a/tests/libfuzzer/corelib/serialization/qcborstreamreader/next/CMakeLists.txt b/tests/libfuzzer/corelib/serialization/qcborstreamreader/next/CMakeLists.txt index 5c3ee2064b2..7858cdaf031 100644 --- a/tests/libfuzzer/corelib/serialization/qcborstreamreader/next/CMakeLists.txt +++ b/tests/libfuzzer/corelib/serialization/qcborstreamreader/next/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(next LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/tests/libfuzzer/corelib/serialization/qcborvalue/fromcbor/CMakeLists.txt b/tests/libfuzzer/corelib/serialization/qcborvalue/fromcbor/CMakeLists.txt index 0c94541e375..1da0a21f5aa 100644 --- a/tests/libfuzzer/corelib/serialization/qcborvalue/fromcbor/CMakeLists.txt +++ b/tests/libfuzzer/corelib/serialization/qcborvalue/fromcbor/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(fromcbor LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/tests/libfuzzer/corelib/serialization/qtextstream/extractionoperator-float/CMakeLists.txt b/tests/libfuzzer/corelib/serialization/qtextstream/extractionoperator-float/CMakeLists.txt index 96fd5790a2d..72cfd09277f 100644 --- a/tests/libfuzzer/corelib/serialization/qtextstream/extractionoperator-float/CMakeLists.txt +++ b/tests/libfuzzer/corelib/serialization/qtextstream/extractionoperator-float/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(extractionoperator-float LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/tests/libfuzzer/corelib/serialization/qxmlstream/qxmlstreamreader/readnext/CMakeLists.txt b/tests/libfuzzer/corelib/serialization/qxmlstream/qxmlstreamreader/readnext/CMakeLists.txt index aa9b550ed3c..79c88970b33 100644 --- a/tests/libfuzzer/corelib/serialization/qxmlstream/qxmlstreamreader/readnext/CMakeLists.txt +++ b/tests/libfuzzer/corelib/serialization/qxmlstream/qxmlstreamreader/readnext/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(readnext LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/tests/libfuzzer/corelib/text/qregularexpression/optimize/CMakeLists.txt b/tests/libfuzzer/corelib/text/qregularexpression/optimize/CMakeLists.txt index 350fbfd6923..d31e48188a8 100644 --- a/tests/libfuzzer/corelib/text/qregularexpression/optimize/CMakeLists.txt +++ b/tests/libfuzzer/corelib/text/qregularexpression/optimize/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(optimize LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/tests/libfuzzer/corelib/time/qdatetime/fromstring/CMakeLists.txt b/tests/libfuzzer/corelib/time/qdatetime/fromstring/CMakeLists.txt index 33154bb562a..adec286291b 100644 --- a/tests/libfuzzer/corelib/time/qdatetime/fromstring/CMakeLists.txt +++ b/tests/libfuzzer/corelib/time/qdatetime/fromstring/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(fromstring LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/tests/libfuzzer/corelib/tools/qcryptographichash/result/CMakeLists.txt b/tests/libfuzzer/corelib/tools/qcryptographichash/result/CMakeLists.txt index 168d9f95b97..1e4ebc9b75d 100644 --- a/tests/libfuzzer/corelib/tools/qcryptographichash/result/CMakeLists.txt +++ b/tests/libfuzzer/corelib/tools/qcryptographichash/result/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(result LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/tests/libfuzzer/gui/image/qimage/loadfromdata/CMakeLists.txt b/tests/libfuzzer/gui/image/qimage/loadfromdata/CMakeLists.txt index 5a573b21ce8..afc695b722f 100644 --- a/tests/libfuzzer/gui/image/qimage/loadfromdata/CMakeLists.txt +++ b/tests/libfuzzer/gui/image/qimage/loadfromdata/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(loadfromdata LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/CMakeLists.txt b/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/CMakeLists.txt index 788a15bd997..5ca99fc305d 100644 --- a/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/CMakeLists.txt +++ b/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(fromiccprofile LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/tests/libfuzzer/gui/text/qtextdocument/sethtml/CMakeLists.txt b/tests/libfuzzer/gui/text/qtextdocument/sethtml/CMakeLists.txt index d4777c1096b..fd502c9972a 100644 --- a/tests/libfuzzer/gui/text/qtextdocument/sethtml/CMakeLists.txt +++ b/tests/libfuzzer/gui/text/qtextdocument/sethtml/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(sethtml LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/tests/libfuzzer/gui/text/qtextdocument/setmarkdown/CMakeLists.txt b/tests/libfuzzer/gui/text/qtextdocument/setmarkdown/CMakeLists.txt index 2d1d45ed86c..0e24a66f0c4 100644 --- a/tests/libfuzzer/gui/text/qtextdocument/setmarkdown/CMakeLists.txt +++ b/tests/libfuzzer/gui/text/qtextdocument/setmarkdown/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(setmarkdown LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/tests/libfuzzer/gui/text/qtextlayout/beginlayout/CMakeLists.txt b/tests/libfuzzer/gui/text/qtextlayout/beginlayout/CMakeLists.txt index 4a593d328ae..eb51b36c69b 100644 --- a/tests/libfuzzer/gui/text/qtextlayout/beginlayout/CMakeLists.txt +++ b/tests/libfuzzer/gui/text/qtextlayout/beginlayout/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(beginlayout LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/tests/libfuzzer/network/ssl/qsslcertificate/qsslcertificate/pem/CMakeLists.txt b/tests/libfuzzer/network/ssl/qsslcertificate/qsslcertificate/pem/CMakeLists.txt index f87344361cf..c10aad68452 100644 --- a/tests/libfuzzer/network/ssl/qsslcertificate/qsslcertificate/pem/CMakeLists.txt +++ b/tests/libfuzzer/network/ssl/qsslcertificate/qsslcertificate/pem/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(pem LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/tests/manual/highdpi/dprgadget/CMakeLists.txt b/tests/manual/highdpi/dprgadget/CMakeLists.txt index e53f0957398..6ed9aaf3256 100644 --- a/tests/manual/highdpi/dprgadget/CMakeLists.txt +++ b/tests/manual/highdpi/dprgadget/CMakeLists.txt @@ -1,5 +1,5 @@ # special case skip regeneration -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(dprgadget LANGUAGES CXX) set(CMAKE_AUTOMOC ON) diff --git a/tests/manual/highdpi/pixelgadget/CMakeLists.txt b/tests/manual/highdpi/pixelgadget/CMakeLists.txt index 38d61df618a..888ce95a8e9 100644 --- a/tests/manual/highdpi/pixelgadget/CMakeLists.txt +++ b/tests/manual/highdpi/pixelgadget/CMakeLists.txt @@ -1,5 +1,5 @@ # special case skip regeneration -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(pixelgadget LANGUAGES CXX) set(CMAKE_AUTOMOC ON) diff --git a/tests/manual/highdpi/screengadget/CMakeLists.txt b/tests/manual/highdpi/screengadget/CMakeLists.txt index cbccd5de695..97442e50a4a 100644 --- a/tests/manual/highdpi/screengadget/CMakeLists.txt +++ b/tests/manual/highdpi/screengadget/CMakeLists.txt @@ -1,5 +1,5 @@ # special case skip regeneration -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(screengadget LANGUAGES CXX) set(CMAKE_AUTOMOC ON) diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 9a780e61321..0bb68ee936e 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -4446,7 +4446,7 @@ def write_regular_cmake_target_scope_section( def handle_config_test_project(scope: Scope, cm_fh: IO[str]): project_name = os.path.splitext(os.path.basename(scope.file_absolute_path))[0] content = ( - f"cmake_minimum_required(VERSION 3.14.0)\n" + f"cmake_minimum_required(VERSION 3.16)\n" f"project(config_test_{project_name} LANGUAGES C CXX)\n" """ foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})