[qt5-base] Move 'icu' out of 'core' feature (#30091)

ports/qt5-base/portfile.cmake

@@ -102,7 +102,6 @@ list(APPEND CORE_OPTIONS
     -system-doubleconversion
     -system-sqlite
     -system-harfbuzz
-    -icu
     -no-angle # Qt does not need to build angle. VCPKG will build angle!
     -no-glib
     -openssl-linked
@@ -207,8 +206,7 @@ set(RELEASE_OPTIONS
             "PCRE2_LIBS=${PCRE2_RELEASE}"
             "FREETYPE_LIBS=${FREETYPE_RELEASE_ALL}"
             "QMAKE_LIBS_PRIVATE+=${BZ2_RELEASE}"
-            "QMAKE_LIBS_PRIVATE+=${LIBPNG_RELEASE}"
+            "QMAKE_LIBS_PRIVATE+=${LIBPNG_RELEASE} ${ZLIB_RELEASE}"
-            "QMAKE_LIBS_PRIVATE+=${ICU_RELEASE}"
             "QMAKE_LIBS_PRIVATE+=${ZSTD_RELEASE}"
             )
 set(DEBUG_OPTIONS
@@ -218,20 +216,28 @@ set(DEBUG_OPTIONS
             "PCRE2_LIBS=${PCRE2_DEBUG}"
             "FREETYPE_LIBS=${FREETYPE_DEBUG_ALL}"
             "QMAKE_LIBS_PRIVATE+=${BZ2_DEBUG}"
-            "QMAKE_LIBS_PRIVATE+=${LIBPNG_DEBUG}"
+            "QMAKE_LIBS_PRIVATE+=${LIBPNG_DEBUG} ${ZLIB_DEBUG}"
-            "QMAKE_LIBS_PRIVATE+=${ICU_DEBUG}"
             "QMAKE_LIBS_PRIVATE+=${ZSTD_DEBUG}"
             )
 
-# This if/else corresponds to icu setup in src/corelib/configure.json.
+if("icu" IN_LIST FEATURES)
-if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    list(APPEND CORE_OPTIONS -icu)
-    list(APPEND CORE_OPTIONS
+
-        "ICU_LIBS_RELEASE=${ICU_RELEASE}"
+    # This if/else corresponds to icu setup in src/corelib/configure.json.
-        "ICU_LIBS_DEBUG=${ICU_DEBUG}"
+    if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    )
+        list(APPEND CORE_OPTIONS
+            "ICU_LIBS_RELEASE=${ICU_RELEASE}"
+            "ICU_LIBS_DEBUG=${ICU_DEBUG}"
+        )
+    else()
+        list(APPEND RELEASE_OPTIONS "ICU_LIBS=${ICU_RELEASE}")
+        list(APPEND DEBUG_OPTIONS "ICU_LIBS=${ICU_DEBUG}")
+    endif()
+
+    list(APPEND RELEASE_OPTIONS "QMAKE_LIBS_PRIVATE+=${ICU_RELEASE}")
+    list(APPEND DEBUG_OPTIONS "QMAKE_LIBS_PRIVATE+=${ICU_DEBUG}")
 else()
-    list(APPEND RELEASE_OPTIONS "ICU_LIBS=${ICU_RELEASE}")
+    list(APPEND CORE_OPTIONS -no-icu)
-    list(APPEND DEBUG_OPTIONS "ICU_LIBS=${ICU_DEBUG}")
 endif()
 
 if(VCPKG_TARGET_IS_WINDOWS)

ports/qt5-base/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "qt5-base",
   "version": "5.15.8",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -14,10 +14,6 @@
     },
     "freetype",
     "harfbuzz",
-    {
-      "name": "icu",
-      "platform": "!uwp"
-    },
     "libjpeg-turbo",
     "libpng",
     {
@@ -44,6 +40,15 @@
     "zstd"
   ],
   "features": {
+    "icu": {
+      "description": "Enable ICU support",
+      "dependencies": [
+        {
+          "name": "icu",
+          "platform": "!uwp"
+        }
+      ]
+    },
     "latest": {
       "description": "(deprecated)"
     },

ports/qt5/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "qt5",
   "version": "5.15.8",
+  "port-version": 1,
   "description": "Qt5 Application Framework",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -91,6 +92,7 @@
           "name": "qt5-base",
           "default-features": false,
           "features": [
+            "icu",
             "mysqlplugin",
             "postgresqlplugin"
           ]

versions/baseline.json

@@ -6342,7 +6342,7 @@
     },
     "qt5": {
       "baseline": "5.15.8",
-      "port-version": 0
+      "port-version": 1
     },
     "qt5-3d": {
       "baseline": "5.15.8",
@@ -6358,7 +6358,7 @@
     },
     "qt5-base": {
       "baseline": "5.15.8",
-      "port-version": 4
+      "port-version": 5
     },
     "qt5-canvas3d": {
       "baseline": "0",

versions/q-/qt5-base.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "51c0d7f3e15a664dba88e8c9891d4a045661f4ec",
+      "version": "5.15.8",
+      "port-version": 5
+    },
     {
       "git-tree": "1528baab40fce203129dc361128135b453e1ecb1",
       "version": "5.15.8",

versions/q-/qt5.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f770e40ee8bc91d18f208ceee737d2c8abfaf8d0",
+      "version": "5.15.8",
+      "port-version": 1
+    },
     {
       "git-tree": "88647dde8c3f8eee01f4b02b3f5a211046e5e5bd",
       "version": "5.15.8",