From 3002816d77d2ee5adfc040176582f3b95116ccfb Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 12 Jan 2023 17:01:15 +0100 Subject: [PATCH] Restrict the minimum supported ICU version to 50.1 ICU 50.1 was released May 11th, 2012. Despite of the restriction, all currently supported operating systems will continue to be supported. All mismatches described in QTBUG-99715 are fixed in this version. Restricting to 72.1 (latest version as per January 2023) or 63.1 (2018) would still exclude e.g. RHEL 9.0, which ships version 56.1. Task-number: QTBUG-109505 Pick-to: 6.5 Change-Id: Ic5cd7927d6f5fb60a89423c305796a9ed311bfa2 Reviewed-by: Alexandru Croitor --- src/corelib/configure.cmake | 4 +++- tests/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 8be7d61c5c4..b0569ab4325 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -26,7 +26,9 @@ qt_find_package(WrapSystemDoubleConversion PROVIDED_TARGETS WrapSystemDoubleConversion::WrapSystemDoubleConversion MODULE_NAME core QMAKE_LIB doubleconversion) qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2 MODULE_NAME core QMAKE_LIB glib) -qt_find_package(ICU COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data MODULE_NAME core QMAKE_LIB icu) +qt_find_package(ICU 50.1 COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data + MODULE_NAME core QMAKE_LIB icu) + if(QT_FEATURE_dlopen) qt_add_qmake_lib_dependency(icu libdl) endif() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index fcc29596614..3c491d96754 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -18,7 +18,7 @@ if(QT_BUILD_STANDALONE_TESTS) qt_internal_set_up_config_optimizations_like_in_qmake() qt_find_package(WrapDBus1 PROVIDED_TARGETS dbus-1) - qt_find_package(ICU COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data) + qt_find_package(ICU 50.1 COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data) qt_find_package(WrapOpenSSL PROVIDED_TARGETS WrapOpenSSL::WrapOpenSSL) qt_find_package(WrapOpenSSLHeaders PROVIDED_TARGETS WrapOpenSSLHeaders::WrapOpenSSLHeaders) # special case end