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