[Qt6] Update to 6.1.1 (#18320)

* [qt6] Update to 6.1.1

* version stuff

* fix empty dir

* update version

* fix casing in qtbase

* [libpq] add secure32.lib on windows

* add clang-cl fix

* version stuff

* fix flag removal by adding a space

* version stuff

* make qt6->Qt6 usage consistent since Qt6 refers to itself as Qt6 with uppercase Q

* fix libpq wrapper opensll linkage on linux

* use policy to fix dependent ports

* version stuff

* use upstream patch

* version stuff

* fix source location for clang-cl

* version stuff

* remove ws change

* version stuff

2 files changed, 41 insertions, 40 deletions

diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake
index 169e86cff..13ec84b84 100644
--- a/ports/qtbase/cmake/qt_install_submodule.cmake
+++ b/ports/qtbase/cmake/qt_install_submodule.cmake
@@ -8,7 +8,7 @@ endif()
 #set(PORT_DEBUG ON)

 

 if(NOT DEFINED QT6_DIRECTORY_PREFIX)

-    set(QT6_DIRECTORY_PREFIX "qt6/")

+    set(QT6_DIRECTORY_PREFIX "Qt6/")

 endif()

 

 macro(qt_stop_on_update)

@@ -52,12 +52,12 @@ function(qt_install_submodule)
 

     if(VCPKG_TARGET_IS_WINDOWS)

         if(NOT ${PORT} MATCHES "qtbase")

-            list(APPEND _qis_CONFIGURE_OPTIONS -DQT_SYNCQT:PATH="${CURRENT_HOST_INSTALLED_DIR}/tools/qt6/bin/syncqt.pl")

+            list(APPEND _qis_CONFIGURE_OPTIONS -DQT_SYNCQT:PATH="${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl")

         endif()

         set(PERL_OPTION -DHOST_PERL:PATH="${PERL}")

     else()

         if(NOT ${PORT} MATCHES "qtbase")

-            list(APPEND _qis_CONFIGURE_OPTIONS -DQT_SYNCQT:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/qt6/bin/syncqt.pl)

+            list(APPEND _qis_CONFIGURE_OPTIONS -DQT_SYNCQT:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl)

         endif()

         set(PERL_OPTION -DHOST_PERL:PATH=${PERL})

     endif()

@@ -97,16 +97,16 @@ function(qt_install_submodule)
             ${_qis_CONFIGURE_OPTIONS_RELEASE}

             -DINSTALL_DOCDIR:STRING=doc/${QT6_DIRECTORY_PREFIX}

             -DINSTALL_INCLUDEDIR:STRING=include/${QT6_DIRECTORY_PREFIX}

-            -DINSTALL_DESCRIPTIONSDIR:STRING=share/qt6/modules

-            -DINSTALL_MKSPECSDIR:STRING=share/qt6/mkspecs

+            -DINSTALL_DESCRIPTIONSDIR:STRING=share/Qt6/modules

+            -DINSTALL_MKSPECSDIR:STRING=share/Qt6/mkspecs

             -DINSTALL_TRANSLATIONSDIR:STRING=translations/${QT6_DIRECTORY_PREFIX}

         OPTIONS_DEBUG

             -DINPUT_debug:BOOL=ON

             -DINSTALL_DOCDIR:STRING=../doc/${QT6_DIRECTORY_PREFIX}

             -DINSTALL_INCLUDEDIR:STRING=../include/${QT6_DIRECTORY_PREFIX}

             -DINSTALL_TRANSLATIONSDIR:STRING=../translations/${QT6_DIRECTORY_PREFIX}

-            -DINSTALL_DESCRIPTIONSDIR:STRING=../share/qt6/modules

-            -DINSTALL_MKSPECSDIR:STRING=../share/qt6/mkspecs

+            -DINSTALL_DESCRIPTIONSDIR:STRING=../share/Qt6/modules

+            -DINSTALL_MKSPECSDIR:STRING=../share/Qt6/mkspecs

             ${_qis_CONFIGURE_OPTIONS_DEBUG}

     )

     vcpkg_install_cmake(ADD_BIN_TO_PATH)

@@ -115,7 +115,7 @@ function(qt_install_submodule)
     ## Handle CMake files. 

     set(COMPONENTS)

     file(GLOB COMPONENTS_OR_FILES LIST_DIRECTORIES true "${CURRENT_PACKAGES_DIR}/share/Qt6*")

-    list(REMOVE_ITEM COMPONENTS_OR_FILES "${CURRENT_PACKAGES_DIR}/share/qt6")

+    list(REMOVE_ITEM COMPONENTS_OR_FILES "${CURRENT_PACKAGES_DIR}/share/Qt6")

     foreach(_glob IN LISTS COMPONENTS_OR_FILES)

         if(IS_DIRECTORY "${_glob}")

             string(REPLACE "${CURRENT_PACKAGES_DIR}/share/Qt6" "" _component "${_glob}")

@@ -126,7 +126,7 @@ function(qt_install_submodule)
 

     foreach(_comp IN LISTS COMPONENTS)

         if(EXISTS "${CURRENT_PACKAGES_DIR}/share/Qt6${_comp}")

-            vcpkg_fixup_cmake_targets(CONFIG_PATH share/Qt6${_comp} TARGET_PATH share/Qt6${_comp} TOOLS_PATH "tools/qt6/bin")

+            vcpkg_fixup_cmake_targets(CONFIG_PATH share/Qt6${_comp} TARGET_PATH share/Qt6${_comp} TOOLS_PATH "tools/Qt6/bin")

             # Would rather put it into share/cmake as before but the import_prefix correction in vcpkg_fixup_cmake_targets is working against that. 

         else()

             message(STATUS "WARNING: Qt component ${_comp} not found/built!")

@@ -150,7 +150,7 @@ function(qt_install_submodule)
         endforeach()

     endif()

 

-    set(qt_tooldest "${CURRENT_PACKAGES_DIR}/tools/qt6/bin")

+    set(qt_tooldest "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin")

     set(qt_searchdir "${CURRENT_PACKAGES_DIR}/bin")

     ## Handle Tools

     foreach(_tool IN LISTS _qis_TOOL_NAMES)

@@ -169,17 +169,17 @@ function(qt_install_submodule)
 

     if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")

         if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/")

-            file(COPY "${CURRENT_PACKAGES_DIR}/bin/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt6/bin")

+            file(COPY "${CURRENT_PACKAGES_DIR}/bin/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin")

         endif()

-        file(GLOB_RECURSE _installed_dll_files RELATIVE "${CURRENT_INSTALLED_DIR}/tools/qt6/bin" "${CURRENT_INSTALLED_DIR}/tools/qt6/bin/*.dll")

+        file(GLOB_RECURSE _installed_dll_files RELATIVE "${CURRENT_INSTALLED_DIR}/tools/Qt6/bin" "${CURRENT_INSTALLED_DIR}/tools/Qt6/bin/*.dll")

         foreach(_dll_to_remove IN LISTS _installed_dll_files)

-            file(GLOB_RECURSE _packaged_dll_file "${CURRENT_PACKAGES_DIR}/tools/qt6/bin/${_dll_to_remove}")

+            file(GLOB_RECURSE _packaged_dll_file "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${_dll_to_remove}")

             if(EXISTS "${_packaged_dll_file}")

                 file(REMOVE "${_packaged_dll_file}")

             endif()

         endforeach()

-        file(GLOB_RECURSE _folders LIST_DIRECTORIES true "${CURRENT_PACKAGES_DIR}/tools/qt6/bin/**/")

-        file(GLOB_RECURSE _files "${CURRENT_PACKAGES_DIR}/tools/qt6/bin/**/")

+        file(GLOB_RECURSE _folders LIST_DIRECTORIES true "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/**/")

+        file(GLOB_RECURSE _files "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/**/")

         if(_files)

             list(REMOVE_ITEM _folders ${_files})

         endif()

diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake
index eb3f464b0..e86a38c65 100644
--- a/ports/qtbase/cmake/qt_port_details.cmake
+++ b/ports/qtbase/cmake/qt_port_details.cmake
@@ -1,4 +1,4 @@
-set(QT_VERSION 6.1.0)

+set(QT_VERSION 6.1.1)

 set(QT_GIT_TAG v${QT_VERSION})

 #set(QT_UPDATE_VERSION TRUE)

 

@@ -30,36 +30,37 @@ set(QT_PORTS qtbase
              qtscxml

              qtvirtualkeyboard

              qtcharts

+             qt

     )

 

 foreach(_port IN LISTS QT_PORTS)

     set(${_port}_TAG ${QT_GIT_TAG})

 endforeach()

 

-set(qtbase_REF             80a246a982e1c332f074f35a365d453c932ccd4e)

-set(qttools_REF            59ba188f13fa01e8590899ecbda47d2680929856)

-set(qtdeclarative_REF      cb6675c5d314c05fb16fe2b9c555cc6a2c488bed)

-set(qtsvg_REF              5bf7d6f7b91a2cb79910cb42afcffddff1ed838b)

-set(qt5compat_REF          752f10fa6f84b8b2b738e46efacbce32125efbb6)

-set(qtshadertools_REF      bcf88361f7a96f02f6c8f77a7fdf8abefae21df4)

-set(qtquicktimeline_REF    d13e054604a24cd88edb92d3e85529f8c8ea631f)

-set(qtquick3d_REF          b3fd7feee9a6350580203935dea7b221de67e4b2)

-set(qttranslations_REF     e69b51751a9ec8c5d45661b83981297c432d0d57)

-set(qtwayland_REF          e22789176e48314be1cbea5d12366eb77a220425)

-set(qtdoc_REF              a8448c0b87376598a64333266f5acccd05e7a1e9)

-set(qtimageformats_REF     2a6985b6e73be2b9f371938ca826430be13f55fd)

-set(qtmqtt_REF             40502be35ca30025b45570574d4ee0f0b6bada2d)

-set(qtquickcontrols2_REF   104555a8682d4095841feb9b02c9fd223c707b8e)

-set(qtnetworkauth_REF      0e055a0ace5705d7a162236bf375b057e9ca124e)

-set(qtcoap_REF             f09ed2ed8078dee75b5e7682b5832b2cee80c3b0)

-set(qtopcua_REF            592ef6d24e8ebee0a35b0e46653f3e5b4f4f2d13)

-set(qtactiveqt_REF         64e781f88e6758826be73751fe547b7e03c82edd)

-set(qtdatavis3d_REF        6c79c3c0cd01ec29ce410e557aef293295349a22)

+set(qtbase_REF             9461362fb0aa5ec91bcfafe1169bd32cf9cfc828)

+set(qttools_REF            3fa59b12c7e23e0eb3fbb0f3a9d3f7fee2669f72)

+set(qtdeclarative_REF      34d723b38ef9b2ef851f589dfd0523420f4c5acc)

+set(qtsvg_REF              242d6a797b6051baccd101978f3e138293701159)

+set(qt5compat_REF          57202ccee96b7297202ba11c867178cff32b6eef)

+set(qtshadertools_REF      954b90fa332b37ba1b60a2fcd92c06a0de6a6322)

+set(qtquicktimeline_REF    2cb89aa7b120ec0ac84426d9f50bf8c613bbcd1e)

+set(qtquick3d_REF          6c5ec5b14829f4181d035ad357f594e32e0e4119)

+set(qttranslations_REF     47deef3a86795ef97708ec1da403a06cf696ec1c)

+set(qtwayland_REF          f2c5c1304fc1a5123243a3a83ac8d8f3f67138ca)

+set(qtdoc_REF              097bdcbf52a3cd798b66318f2b453cd01640e06b)

+set(qtimageformats_REF     6cd036f63ff4b939f2ceb02fda98303a89a1b4b1)

+set(qtmqtt_REF             d5c00c7245916a919b408578a6dd17bfac0e064d)

+set(qtquickcontrols2_REF   1d84dc70059a6e324faab3535cb3958c6fa52fab)

+set(qtnetworkauth_REF      a903abe7e43123ecd727ca2e29d552c5ed639552)

+set(qtcoap_REF             160c3fb6850be44c09142150aef165a09946a608)

+set(qtopcua_REF            c025fe5182a369723a67be06d64cbfbf2760ba0e)

+set(qtactiveqt_REF         b9cf1840e44d5283f2212a73ba7b74ec18564d5a)

+set(qtdatavis3d_REF        1629d860192ffc644a5c0c7d63e18a6ee6d5e295)

 #set(qtdeviceutils_REF      0) #missing tag

-set(qtlottie_REF           a8c5919df0c6fb9904920d20c4bb0ea18bcaba94)

-set(qtscxml_REF            fb5dedff2f1ddbeeba680c4cf297525c0fd85652)

-set(qtvirtualkeyboard_REF  66a0ecd2db90097fe961437e539182ee5ef17b33)

-set(qtcharts_REF           0e713697ab2454b1c870cb750510b280f8059b0e)

+set(qtlottie_REF           f6a4557b1484b9ad7db4bae8c5b6b264618876e5)

+set(qtscxml_REF            666adc604fec06fa5b38be4d4f1b0e9b56f16c2b)

+set(qtvirtualkeyboard_REF  5c7df0c55a96e9855bd27c23a18d6f2d91305d31)

+set(qtcharts_REF           251d18d960a6f6ee04f07ba338beb317c425e0a2)

 

 if(QT_UPDATE_VERSION)

     message(STATUS "Running Qt in automatic version port update mode!")

@@ -68,7 +69,7 @@ if(QT_UPDATE_VERSION)
         foreach(_current_qt_port IN LISTS QT_PORTS)

             set(_current_control "${VCPKG_ROOT_DIR}/ports/${_current_qt_port}/vcpkg.json")

             file(READ "${_current_control}" _control_contents)

-            string(REGEX REPLACE "\"version-string\": [^\n]+\n" "\"version-string\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}")

+            string(REGEX REPLACE "\"version-(string|semver)\": [^\n]+\n" "\"version-semver\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}")

             file(WRITE "${_current_control}" "${_control_contents}")

             #need to run a vcpkg format-manifest --all after update once 

         endforeach()