microsoft · BillyONeal · Jun 21, 2021 · Jun 7, 2021 · Jun 7, 2021 · Jun 8, 2021
diff --git 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
@@ -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
@@ -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/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,45 +30,46 @@ 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!")
     set(_VCPKG_INTERNAL_NO_HASH_CHECK 1)
     if("${PORT}" MATCHES "qtbase")
-        foreach(_current_qt_port IN LISTS QT_PORTS)
+        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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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",