[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
author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> 2021-06-21 22:45:33 +0200
committer: GitHub <noreply@github.com> 2021-06-21 13:45:33 -0700
commit: 33d9cd45ffb089f790c7979653a906f28a35df98 (patch)
tree: 7e0c7d4840b2d11f89451eb2545e1e1f5a017568
parent: ec5178efe5c743413f0a07137fbdff47be970e0f (diff)
download: vcpkg-33d9cd45ffb089f790c7979653a906f28a35df98.tar.gz
vcpkg-33d9cd45ffb089f790c7979653a906f28a35df98.zip
59 files changed, 404 insertions, 139 deletions
diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json
index 90927a82b..2c4c3da63 100644
--- a/ports/qt/vcpkg.json
+++ b/ports/qt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "Qt",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json
index 375f8b2f6..85c1e355a 100644
--- a/ports/qt5compat/vcpkg.json
+++ b/ports/qt5compat/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5compat",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "The module contains unsupported Qt 5 APIs",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json
index 74082ea18..99dbf9e75 100644
--- a/ports/qtactiveqt/vcpkg.json
+++ b/ports/qtactiveqt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtactiveqt",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "ActiveQt",
   "homepage": "https://www.qt.io/",
   "supports": "windows",
diff --git a/ports/qtbase/20b3eb0.diff b/ports/qtbase/20b3eb0.diff
new file mode 100644
index 000000000..978b30ffa
--- /dev/null
+++ b/ports/qtbase/20b3eb0.diff
@@ -0,0 +1,130 @@
+From 20b3eb0fd8b5f82cf432f2c06e7c5d3f533df0a5 Mon Sep 17 00:00:00 2001
+From: Cristian Adam <cristian.adam@qt.io>
+Date: Thu, 03 Jun 2021 12:42:07 +0200
+Subject: [PATCH] CMake: Add support for building with clang-cl
+
+qmake had support for building with clang-cl as the win32-clang-msvc mkspec.
+
+Task-number: QTBUG-89642
+Task-number: QTBUG-88081
+Change-Id: I0709c289f90fedb121620d1e67ef841602219816
+Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
+---
+
+diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
+index bb8b146..792276e 100644
+--- a/cmake/QtBuild.cmake
++++ b/cmake/QtBuild.cmake
+@@ -285,7 +285,9 @@
+         list(APPEND QT_DEFAULT_PLATFORM_DEFINITIONS WIN64 _WIN64)
+     endif()
+     if(MSVC)
+-        if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
++        if (CLANG)
++            set(QT_DEFAULT_MKSPEC win32-clang-msvc)
++        elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+             set(QT_DEFAULT_MKSPEC win32-arm64-msvc)
+         else()
+             set(QT_DEFAULT_MKSPEC win32-msvc)
+diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake
+index 0c57d9e..0eeccce 100644
+--- a/cmake/QtFlagHandlingHelpers.cmake
++++ b/cmake/QtFlagHandlingHelpers.cmake
+@@ -235,7 +235,7 @@
+ function(qt_set_msvc_cplusplus_options target visibility)
+     # For MSVC we need to explicitly pass -Zc:__cplusplus to get correct __cplusplus.
+     # Check qt_config_compile_test for more info.
+-    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND MSVC_VERSION GREATER_EQUAL 1913)
++    if(MSVC AND MSVC_VERSION GREATER_EQUAL 1913)
+         target_compile_options("${target}" ${visibility} "-Zc:__cplusplus" "-permissive-")
+     endif()
+ endfunction()
+diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
+index 2c991f7..9f0c95e 100644
+--- a/src/corelib/CMakeLists.txt
++++ b/src/corelib/CMakeLists.txt
+@@ -263,4 +263,24 @@
+     # special case end
+ )
+ 
++if (MSVC AND CLANG)
++    foreach(subarch sse4_1 rdrnd rdseed)
++        if (TEST_subarch_${subarch})
++            qt_internal_add_simd_part(Core SIMD ${subarch}
++                SOURCES
++                    global/qsimd.cpp
++            )
++        endif()
++    endforeach()
++
++    foreach(subarch sse4_1 aesni)
++        if (TEST_subarch_${subarch})
++            qt_internal_add_simd_part(Core SIMD ${subarch}
++                SOURCES
++                    tools/qhash.cpp
++            )
++        endif()
++    endforeach()
++endif()
++
+ # special case begin
+diff --git a/src/corelib/global/qt_pch.h b/src/corelib/global/qt_pch.h
+index 5869751..6108b07 100644
+--- a/src/corelib/global/qt_pch.h
++++ b/src/corelib/global/qt_pch.h
+@@ -62,17 +62,22 @@
+ # define _POSIX_
+ # include <limits.h>
+ # undef _POSIX_
+-#endif
+-#include <qcoreapplication.h>
+-#include <qcoreevent.h>
+-#include <qiodevice.h>
+-#include <qlist.h>
+-#include <qvariant.h>  /* All moc genereated code has this include */
+-#include <qobject.h>
+-#include <qregularexpression.h>
+-#include <qscopedpointer.h>
+-#include <qshareddata.h>
+-#include <qstring.h>
+-#include <qstringlist.h>
+-#include <qtimer.h>
++#        if defined(Q_CC_CLANG) && defined(Q_CC_MSVC)
++// See https://bugs.llvm.org/show_bug.cgi?id=41226
++#            include <wchar.h>
++__declspec(selectany) auto *__wmemchr_symbol_loader_value = wmemchr(L"", L'0', 0);
++#        endif
++#    endif
++#    include <qcoreapplication.h>
++#    include <qcoreevent.h>
++#    include <qiodevice.h>
++#    include <qlist.h>
++#    include <qvariant.h> /* All moc genereated code has this include */
++#    include <qobject.h>
++#    include <qregularexpression.h>
++#    include <qscopedpointer.h>
++#    include <qshareddata.h>
++#    include <qstring.h>
++#    include <qstringlist.h>
++#    include <qtimer.h>
+ #endif
+diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
+index 5fe4d59..04f58dd 100644
+--- a/src/gui/CMakeLists.txt
++++ b/src/gui/CMakeLists.txt
+@@ -577,6 +577,15 @@
+         )
+     endif()
+ 
++    if (MSVC AND CLANG AND TEST_subarch_sse4_1)
++        qt_internal_add_simd_part(Gui SIMD sse4_1
++            SOURCES
++                painting/qdrawhelper.cpp
++                painting/qdrawhelper_sse2.cpp
++                painting/qdrawhelper_ssse3.cpp
++        )
++    endif()
++
+     qt_internal_add_simd_part(Gui SIMD ssse3
+         SOURCES
+             image/qimage_ssse3.cpp
diff --git a/ports/qtbase/clang-cl_source_location.patch b/ports/qtbase/clang-cl_source_location.patch
new file mode 100644
index 000000000..643220245
--- /dev/null
+++ b/ports/qtbase/clang-cl_source_location.patch
@@ -0,0 +1,13 @@
+diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h
+index 823b2057b..4a8cd4fa8 100644
+--- a/src/corelib/kernel/qproperty.h
++++ b/src/corelib/kernel/qproperty.h
+@@ -49,7 +49,7 @@
+ 
+ #include <QtCore/qpropertyprivate.h>
+ 
+-#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC)
++#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) && defined(__cpp_consteval)
+ #include <source_location>
+ #define QT_SOURCE_LOCATION_NAMESPACE std
+ #define QT_PROPERTY_COLLECT_BINDING_LOCATION
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()
diff --git a/ports/qtbase/dc5e7b6.diff b/ports/qtbase/dc5e7b6.diff
new file mode 100644
index 000000000..e420267b2
--- /dev/null
+++ b/ports/qtbase/dc5e7b6.diff
@@ -0,0 +1,22 @@
+diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake
+index 0eeccce..2ee41c2 100644
+--- a/cmake/QtFlagHandlingHelpers.cmake
++++ b/cmake/QtFlagHandlingHelpers.cmake
+@@ -421,7 +421,7 @@
+     # cache variable with FORCE will overwrite the non-cache variable in this
+     # function scope, but we need to use the original value before that change.
+     foreach(flag_value IN LISTS flag_values)
+-        string(${replace_type} "${flag_value}" "" ${flag_var_name} "${${flag_var_name}}")
++        string(${replace_type} "${flag_value}" " " ${flag_var_name} "${${flag_var_name}}")
+     endforeach()
+     string(STRIP "${${flag_var_name}}" ${flag_var_name})
+     set(${flag_var_name} "${${flag_var_name}}" PARENT_SCOPE)
+@@ -433,7 +433,7 @@
+         # Work exclusively on cache variable value only.
+         set(mod_flags $CACHE{${flag_var_name}})
+         foreach(flag_value IN LISTS flag_values)
+-            string(${replace_type} "${flag_value}" "" mod_flags "${mod_flags}")
++            string(${replace_type} "${flag_value}" " " mod_flags "${mod_flags}")
+         endforeach()
+         string(STRIP "${mod_flags}" mod_flags)
+         get_property(help_text CACHE ${flag_var_name} PROPERTY HELPSTRING)
diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake
index 40f58858c..0ae81659b 100644
--- a/ports/qtbase/portfile.cmake
+++ b/ports/qtbase/portfile.cmake
@@ -11,6 +11,9 @@ set(${PORT}_PATCHES
         buildcmake.patch
         dont_force_cmakecache.patch
         fix_find_dep.patch
+        20b3eb0.diff # Upstream fix to build with clang-cl; didn't make 6.1.1 so I backported the patch. 
+        dc5e7b6.diff 
+        clang-cl_source_location.patch
         )
 
 if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST)
@@ -274,10 +277,10 @@ foreach(_config debug release)
     if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin")
         continue()
     endif()
-    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/qt6/bin/${path_suffix}")
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}")
     foreach(script IN LISTS script_files)
         if(EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${script}${script_suffix}")
-            set(target_script "${CURRENT_PACKAGES_DIR}/tools/qt6/bin/${path_suffix}${script}${script_suffix}")
+            set(target_script "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}${script}${script_suffix}")
             file(RENAME "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${script}${script_suffix}" "${target_script}")
             file(READ "${target_script}" _contents)
             if(_config MATCHES "debug")
@@ -290,7 +293,7 @@ foreach(_config debug release)
     endforeach()
     foreach(other IN LISTS other_files)
         if(EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other}")
-            file(RENAME "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other}" "${CURRENT_PACKAGES_DIR}/tools/qt6/bin/${path_suffix}${other}")
+            file(RENAME "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}${other}")
         endif()
     endforeach()
 endforeach()
@@ -308,20 +311,23 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Qt6/QtBuildInternals")
 if(NOT VCPKG_TARGET_IS_OSX)
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Qt6/macos")
 endif()
+if(NOT VCPKG_TARGET_IS_IOS)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Qt6/ios")
+endif() 
 
 set(_file "${CMAKE_CURRENT_LIST_DIR}/qt.conf.in")
 set(REL_PATH)
-configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/qt6/qt_release.conf" @ONLY)
+configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_release.conf" @ONLY)
 set(BACKUP_CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}")
 set(BACKUP_CURRENT_HOST_INSTALLED_DIR "${CURRENT_HOST_INSTALLED_DIR}")
 set(CURRENT_INSTALLED_DIR "./../../../")
 set(CURRENT_HOST_INSTALLED_DIR "./../../../")
-configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/qt6/bin/qt.conf")
+configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qt.conf")
 set(REL_PATH debug/)
-configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/qt6/bin/qt.debug.conf")
+configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qt.debug.conf")
 set(CURRENT_INSTALLED_DIR "${BACKUP_CURRENT_INSTALLED_DIR}")
 set(CURRENT_HOST_INSTALLED_DIR "${BACKUP_CURRENT_HOST_INSTALLED_DIR}")
-configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/qt6/qt_debug.conf" @ONLY)
+configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_debug.conf" @ONLY)
 
 if(VCPKG_TARGET_IS_WINDOWS)
     set(_DLL_FILES brotlicommon brotlidec bz2 freetype harfbuzz libpng16)
@@ -331,19 +337,19 @@ if(VCPKG_TARGET_IS_WINDOWS)
             list(APPEND DLLS_TO_COPY "${CURRENT_INSTALLED_DIR}/bin/${_file}.dll")
         endif()
     endforeach()
-    file(COPY ${DLLS_TO_COPY} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt6/bin")
+    file(COPY ${DLLS_TO_COPY} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin")
 endif()
 
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/qmake.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt6/bin")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/qmake.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin")
 set(hostinfofile "${CURRENT_PACKAGES_DIR}/share/Qt6HostInfo/Qt6HostInfoConfig.cmake")
 file(READ "${hostinfofile}" _contents)
-string(REPLACE [[set(QT6_HOST_INFO_LIBEXECDIR "bin")]] [[set(QT6_HOST_INFO_LIBEXECDIR "tools/qt6/bin")]] _contents "${_contents}")
-string(REPLACE [[set(QT6_HOST_INFO_BINDIR "bin")]] [[set(QT6_HOST_INFO_BINDIR "tools/qt6/bin")]] _contents "${_contents}")
+string(REPLACE [[set(QT6_HOST_INFO_LIBEXECDIR "bin")]] [[set(QT6_HOST_INFO_LIBEXECDIR "tools/Qt6/bin")]] _contents "${_contents}")
+string(REPLACE [[set(QT6_HOST_INFO_BINDIR "bin")]] [[set(QT6_HOST_INFO_BINDIR "tools/Qt6/bin")]] _contents "${_contents}")
 file(WRITE "${hostinfofile}" "${_contents}")
 
 set(coretools "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreTools.cmake")
 if(EXISTS "${coretools}")
     file(READ "${coretools}" _contents)
-    string(REPLACE [[ "${_IMPORT_PREFIX}/tools/qt6/bin/qmake.exe"]] [["${_IMPORT_PREFIX}/tools/qt6/bin/qmake.debug.bat"]] _contents "${_contents}")
+    string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.exe"]] [["${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.debug.bat"]] _contents "${_contents}")
     file(WRITE "${coretools}" "${_contents}")
 endif()
diff --git a/ports/qtbase/qt.conf.in b/ports/qtbase/qt.conf.in
index c78fc7cb6..ba5c0ee2d 100644
--- a/ports/qtbase/qt.conf.in
+++ b/ports/qtbase/qt.conf.in
@@ -6,9 +6,9 @@ Plugins=@REL_PATH@@QT6_DIRECTORY_PREFIX@plugins
 Qml2Imports=@REL_PATH@@QT6_DIRECTORY_PREFIX@qml
 Documentation=doc/@QT6_DIRECTORY_PREFIX@
 Binaries=@REL_PATH@bin
-LibraryExecutables=tools/qt6/bin
-ArchData=share/qt6
-Data=share/qt6
+LibraryExecutables=tools/Qt6/bin
+ArchData=share/Qt6
+Data=share/Qt6
 Translations=translations/@QT6_DIRECTORY_PREFIX@
 Examples=share/examples/@QT6_DIRECTORY_PREFIX@
 [Paths]
@@ -19,13 +19,13 @@ Plugins=@REL_PATH@@QT6_DIRECTORY_PREFIX@plugins
 Qml2Imports=@REL_PATH@@QT6_DIRECTORY_PREFIX@qml
 Documentation=doc/@QT6_DIRECTORY_PREFIX@
 Binaries=@REL_PATH@bin
-LibraryExecutables=tools/qt6/bin
-ArchData=share/qt6
-Data=share/qt6
+LibraryExecutables=tools/Qt6/bin
+ArchData=share/Qt6
+Data=share/Qt6
 Translations=translations/@QT6_DIRECTORY_PREFIX@
 Examples=share/examples/@QT6_DIRECTORY_PREFIX@
 HostPrefix=${CURRENT_HOST_INSTALLED_DIR}
-HostData=share/qt6
+HostData=share/Qt6
 HostBinaries=@REL_PATH@bin
 HostLibraries=@REL_PATH@lib
-HostLibraryExecutables=tools/qt6/bin
+HostLibraryExecutables=tools/Qt6/bin
diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
index 4d02b8e05..3ca8dc788 100644
--- a/ports/qtbase/vcpkg.json
+++ b/ports/qtbase/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtbase",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json
index 9fa9d47db..4129cdfca 100644
--- a/ports/qtcharts/vcpkg.json
+++ b/ports/qtcharts/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtcharts",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "QtCharts module",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json
index a187dcf88..0b1deb3cd 100644
--- a/ports/qtcoap/vcpkg.json
+++ b/ports/qtcoap/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtcoap",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "Qt CoAP client module",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json
index 2de4a9262..35bdd4a67 100644
--- a/ports/qtdatavis3d/vcpkg.json
+++ b/ports/qtdatavis3d/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtdatavis3d",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "Qt 3D data visualization framework",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json
index 99866447b..9e70f72cf 100644
--- a/ports/qtdeclarative/vcpkg.json
+++ b/ports/qtdeclarative/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtdeclarative",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "Qt Declarative (Quick 2)",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json
index 124668238..59bf0aaf2 100644
--- a/ports/qtdoc/vcpkg.json
+++ b/ports/qtdoc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtdoc",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "Qt Documentation",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qtimageformats/portfile.cmake b/ports/qtimageformats/portfile.cmake
index 54e597412..db31bc4d3 100644
--- a/ports/qtimageformats/portfile.cmake
+++ b/ports/qtimageformats/portfile.cmake
@@ -2,8 +2,7 @@ set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # Only plugins
 set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
 include("${SCRIPT_PATH}/qt_install_submodule.cmake")
 
-set(${PORT}_PATCHES #webp.patch
-    )
+set(${PORT}_PATCHES)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     INVERTED_FEATURES
@@ -30,17 +29,8 @@ endif()
 list(APPEND FEATURE_OPTIONS -DINPUT_mng=no) # marked as FIXME
 
 qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
-                     #TOOL_NAMES ${TOOL_NAMES}
                      CONFIGURE_OPTIONS
-                        #--trace
                         ${FEATURE_OPTIONS}
                      CONFIGURE_OPTIONS_RELEASE
                      CONFIGURE_OPTIONS_DEBUG
                     )
-
-if("jasper" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT QT_UPDATE_VERSION)
-    file(INSTALL "${SOURCE_PATH}/cmake/FindWrapJasper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/Qt6")
-endif()
-if("webp" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT QT_UPDATE_VERSION)
-    file(INSTALL "${SOURCE_PATH}/cmake/FindWrapWebP.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/Qt6")
-endif()
diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json
index f1fb09d5a..22353d2a8 100644
--- a/ports/qtimageformats/vcpkg.json
+++ b/ports/qtimageformats/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtimageformats",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "Additional Image Format plugins for Qt",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qtimageformats/webp.patch b/ports/qtimageformats/webp.patch
deleted file mode 100644
index 23eda0ac8..000000000
--- a/ports/qtimageformats/webp.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/cmake/FindWrapWebP.cmake b/cmake/FindWrapWebP.cmake
-index 6cdb76b5e..5264044de 100644
---- a/cmake/FindWrapWebP.cmake
-+++ b/cmake/FindWrapWebP.cmake
-@@ -6,10 +6,10 @@
- # paths as hints.
- 
- find_package(WebP QUIET)
--if(TARGET WebP::webp AND TARGET WebP::webpdemux AND TARGET WebP::webpmux)
-+if(TARGET WebP::webp AND TARGET WebP::webpdemux AND TARGET WebP::libwebpmux)
-     set(WrapWebP_FOUND ON)
-     add_library(WrapWebP::WrapWebP INTERFACE IMPORTED)
--    target_link_libraries(WrapWebP::WrapWebP INTERFACE WebP::webp WebP::webpdemux Webp::webpmux)
-+    target_link_libraries(WrapWebP::WrapWebP INTERFACE WebP::webp WebP::webpdemux WebP::libwebpmux)
-     return()
- endif()
- 
diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json
index 418c7dd75..c235aa640 100644
--- a/ports/qtlottie/vcpkg.json
+++ b/ports/qtlottie/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtlottie",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json
index ddc465a16..fb1be27af 100644
--- a/ports/qtmqtt/vcpkg.json
+++ b/ports/qtmqtt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtmqtt",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json
index 3ac2baf0c..ddc43cbb2 100644
--- a/ports/qtnetworkauth/vcpkg.json
+++ b/ports/qtnetworkauth/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtnetworkauth",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "Qt Network Authenticators; QtOAuth in particular",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json
index 164f96e8e..22226b885 100644
--- a/ports/qtopcua/vcpkg.json
+++ b/ports/qtopcua/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtopcua",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "Qt wrapper for existing OPC UA stacks",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json
index d4fcd192d..6ec42763f 100644
--- a/ports/qtquick3d/vcpkg.json
+++ b/ports/qtquick3d/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtquick3d",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "A new module and API for defining 3D content in Qt Quick.",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qtquickcontrols2/vcpkg.json b/ports/qtquickcontrols2/vcpkg.json
index 8e37ea196..699d9f53d 100644
--- a/ports/qtquickcontrols2/vcpkg.json
+++ b/ports/qtquickcontrols2/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtquickcontrols2",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "Qt Quick Controls 2",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json
index 6c65198f0..5ed5f43bd 100644
--- a/ports/qtquicktimeline/vcpkg.json
+++ b/ports/qtquicktimeline/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtquicktimeline",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "Module for keyframe-based timeline construction.",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json
index 878af0d4d..4cc3c4d0c 100644
--- a/ports/qtscxml/vcpkg.json
+++ b/ports/qtscxml/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtscxml",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "SCXML (state machine notation) compiler and related tools",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json
index 7a4e7b93a..4821d9e19 100644
--- a/ports/qtshadertools/vcpkg.json
+++ b/ports/qtshadertools/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtshadertools",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json
index fdab8c53a..817abf5e7 100644
--- a/ports/qtsvg/vcpkg.json
+++ b/ports/qtsvg/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtsvg",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "Qt SVG",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake
index f65cf8ce1..c621e0c93 100644
--- a/ports/qttools/portfile.cmake
+++ b/ports/qttools/portfile.cmake
@@ -86,9 +86,9 @@ if(VCPKG_TARGET_IS_OSX)
 endif()
 
 set(configfile "${CURRENT_PACKAGES_DIR}/share/Qt6ToolsTools/Qt6ToolsToolsTargets-debug.cmake")
-if(EXISTS "${configfile}" AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/qt6/bin/windeployqt.exe")
-    file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/windeployqt.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt6/bin")
+if(EXISTS "${configfile}" AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/windeployqt.exe")
+    file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/windeployqt.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin")
     file(READ "${configfile}" _contents)
-    string(REPLACE [[${_IMPORT_PREFIX}/tools/qt6/bin/windeployqt.exe]] [[${_IMPORT_PREFIX}/tools/qt6/bin/windeployqt.debug.bat]] _contents "${_contents}")
+    string(REPLACE [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.exe]] [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.debug.bat]] _contents "${_contents}")
     file(WRITE "${configfile}" "${_contents}")
 endif()
diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json
index 86d9efa48..7567f2220 100644
--- a/ports/qttools/vcpkg.json
+++ b/ports/qttools/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qttools",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "Qt Tools",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json
index 82f8d001b..c6b80e943 100644
--- a/ports/qttranslations/vcpkg.json
+++ b/ports/qttranslations/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qttranslations",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "Qt Translations",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json
index 62328e2fb..e73d5f3e9 100644
--- a/ports/qtvirtualkeyboard/vcpkg.json
+++ b/ports/qtvirtualkeyboard/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtvirtualkeyboard",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "SCXML (state machine notation) compiler and related tools",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json
index e4d800306..a8f732f6a 100644
--- a/ports/qtwayland/vcpkg.json
+++ b/ports/qtwayland/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtwayland",
-  "version-semver": "6.1.0",
+  "version-semver": "6.1.1",
   "description": "A toolbox for making Qt based Wayland compositors",
   "homepage": "https://www.qt.io/",
   "supports": "!windows",
diff --git a/versions/baseline.json b/versions/baseline.json
index 5e924fc50..cfb29f130 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5065,7 +5065,7 @@
       "port-version": 1
     },
     "qt": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qt-advanced-docking-system": {
@@ -5245,7 +5245,7 @@
       "port-version": 0
     },
     "qt5compat": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qt6betablock": {
@@ -5253,35 +5253,35 @@
       "port-version": 0
     },
     "qtactiveqt": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qtbase": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qtcharts": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qtcoap": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qtdatavis3d": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qtdeclarative": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qtdoc": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qtimageformats": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qtkeychain": {
@@ -5289,59 +5289,59 @@
       "port-version": 0
     },
     "qtlottie": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qtmqtt": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qtnetworkauth": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qtopcua": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qtquick3d": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qtquickcontrols2": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qtquicktimeline": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qtscxml": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qtshadertools": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qtsvg": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qttools": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qttranslations": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qtvirtualkeyboard": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "qtwayland": {
-      "baseline": "6.1.0",
+      "baseline": "6.1.1",
       "port-version": 0
     },
     "quadtree": {
diff --git a/versions/q-/qt.json b/versions/q-/qt.json
index 6fd408260..cc389853f 100644
--- a/versions/q-/qt.json
+++ b/versions/q-/qt.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "21fd23ba62f5f9c76024d715eb025a6d7458266b",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "3049962a022e42ab77ecda0b58e6480de6f6a38f",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json
index 5e7f04c28..927a76006 100644
--- a/versions/q-/qt5compat.json
+++ b/versions/q-/qt5compat.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "b47025d88998f99cdfe58e3df9498c3a08d72883",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "33d9b2ff872cbc458a0ce0145a30f6f702d1fb58",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json
index 3dddf58b0..590f24102 100644
--- a/versions/q-/qtactiveqt.json
+++ b/versions/q-/qtactiveqt.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "3e20968097c4a9d81833f16c2f6637b67e72258f",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "0341fe2cf4a7eafcb0b73f0adbdb37a151bc3000",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index 0f91c0a00..b351db070 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "8f4c208e4c4606ae0f7663901399720437358e76",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "c13214dac08887f541c416d36de97a86560d13f5",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json
index fb8c3b784..1a1d8b8bd 100644
--- a/versions/q-/qtcharts.json
+++ b/versions/q-/qtcharts.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "5c3e47558bcd193afac22d72771d726b4e4721a1",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "1890f3d4b87f50fd6d16ffbc03d5d023762fc58b",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json
index 0e5a7e069..198ee4ec5 100644
--- a/versions/q-/qtcoap.json
+++ b/versions/q-/qtcoap.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "2dec36ef658a413500ce4486e1d82fe377b3a99c",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "435511150f075d71b1f947e89b1f0d306ffe251e",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json
index a02ef7197..855b909e9 100644
--- a/versions/q-/qtdatavis3d.json
+++ b/versions/q-/qtdatavis3d.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "0940f08a99ce3d6f46e2ad01242645ee4b4d61d5",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "1d69299b89bc39acbf73afb5353a40f6540a04d2",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json
index 8a000e41b..ba440fd7b 100644
--- a/versions/q-/qtdeclarative.json
+++ b/versions/q-/qtdeclarative.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "54b33929f07b96d7284b3b79923cafd06bdcb207",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "30dd12410732756cf29ae1317de8f029010c9f22",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json
index a105be68e..67e0524dc 100644
--- a/versions/q-/qtdoc.json
+++ b/versions/q-/qtdoc.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "5bf8d66cd624cdbc6158070163895171a76feb3e",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "e77ae101a8432595ff4f428ebbae194f720c2792",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json
index 7f3311091..31046ef5b 100644
--- a/versions/q-/qtimageformats.json
+++ b/versions/q-/qtimageformats.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "e5b06628ae9af1093a1b5a858cec9ca49d0488a6",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "a663532b7f1e64a346f94c27270c2ae7142780ad",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json
index 75bb5e49c..9188cc933 100644
--- a/versions/q-/qtlottie.json
+++ b/versions/q-/qtlottie.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "58c76699b4615a2d73f708a7216bee9f1e04e265",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "9a823fe108a9efbcd6cc83f5b7ff283a7500a9fb",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json
index 4df16f480..0761cb41b 100644
--- a/versions/q-/qtmqtt.json
+++ b/versions/q-/qtmqtt.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "a1503fed7d188e3ec61c12c590c34dd5bd80c88c",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "a13ec187af88d84a53445c1bcb99aa9c60a9966d",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json
index d2830f3e1..e30eed15f 100644
--- a/versions/q-/qtnetworkauth.json
+++ b/versions/q-/qtnetworkauth.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "1176858af90b88c983584218ed702abdb184b942",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "e72fbfa1b11b2eb4673afbad3198462602ff7123",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json
index 9e813ae9d..0356ac85e 100644
--- a/versions/q-/qtopcua.json
+++ b/versions/q-/qtopcua.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "12ea0d30494f580a959c288490e0443e06ecc5b8",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "22f34050bedeeaf97c6bb7cc6a556f6190ebf7c3",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json
index d082884bb..58346078d 100644
--- a/versions/q-/qtquick3d.json
+++ b/versions/q-/qtquick3d.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "a9df9d17c45c39e2a6bf24cff0458bc690f16f1c",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "8bbeae91ec304b0695da0e53b436e05a3ac03050",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtquickcontrols2.json b/versions/q-/qtquickcontrols2.json
index 72c024d6f..d67281984 100644
--- a/versions/q-/qtquickcontrols2.json
+++ b/versions/q-/qtquickcontrols2.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "ab667ec0d159c9e2b729dd42c7a0225c9cca6000",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "601cfca0a0ae61f4737064a5003f5c83736eda30",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json
index 560499dbd..f00a9a40b 100644
--- a/versions/q-/qtquicktimeline.json
+++ b/versions/q-/qtquicktimeline.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "8ae8944b42dacf2e13322dd2946e008056b27dea",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "5fc074f13b064d388ee11fa172ea1bccfa3a448c",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json
index a23051770..2934589e7 100644
--- a/versions/q-/qtscxml.json
+++ b/versions/q-/qtscxml.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "fab8ae306010c0bc21189d746169b8f52d728c40",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "015b07e4fe4a948c5c4d00d18c34eeb64c6752f4",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json
index 1bf79fd9d..5c3be9ac5 100644
--- a/versions/q-/qtshadertools.json
+++ b/versions/q-/qtshadertools.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "68ddad00b0176a27f54fa87b04c55e612f9ee87f",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "40bcf168e248310e309ff201f6e96fa44b13c4e9",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json
index acced0552..54177ac31 100644
--- a/versions/q-/qtsvg.json
+++ b/versions/q-/qtsvg.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "12588c47b6c0faa970cdfc550f5f1526e8811c79",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "c30f32af2bdc755e3c2fcf0a0cc64f23632983bd",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json
index 72450bade..5054857f5 100644
--- a/versions/q-/qttools.json
+++ b/versions/q-/qttools.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "93ebe354c38cc124370c24d066d2a631444347e8",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "ce742ed3dcd05d27552874077744ce955375390c",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json
index 015c50ae3..ffb86daf3 100644
--- a/versions/q-/qttranslations.json
+++ b/versions/q-/qttranslations.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "8a70306f29690e0d5bb1a8fa99ed1c4108b5a247",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "c452d28bfe0ffaf87dc622761dbd5aa217e938ca",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json
index b4b488258..354106b8b 100644
--- a/versions/q-/qtvirtualkeyboard.json
+++ b/versions/q-/qtvirtualkeyboard.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "6d8d0ee73c77d2b796669b3e874f91d0c7270aa7",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "e267466518c4622bcd79052d2fcd8066da4202e8",
       "version-semver": "6.1.0",
       "port-version": 0
diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json
index 52174de2b..8391bd379 100644
--- a/versions/q-/qtwayland.json
+++ b/versions/q-/qtwayland.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "3b9d48c269a94eb37c62a7e81358855065cdd6cf",
+      "version-semver": "6.1.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "712d72065cb213eaaf1ce574c6d3fde99a8ff02e",
       "version-semver": "6.1.0",
       "port-version": 0
author	Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>	2021-06-21 22:45:33 +0200
committer	GitHub <noreply@github.com>	2021-06-21 13:45:33 -0700
commit	33d9cd45ffb089f790c7979653a906f28a35df98 (patch)
tree	7e0c7d4840b2d11f89451eb2545e1e1f5a017568
parent	ec5178efe5c743413f0a07137fbdff47be970e0f (diff)
download	vcpkg-33d9cd45ffb089f790c7979653a906f28a35df98.tar.gz vcpkg-33d9cd45ffb089f790c7979653a906f28a35df98.zip