[qt] update to 6.4.2 (#28774)

* [qt] update to 6.4.2 * v db * qtspeech prepare for features if required ports get added * v db * retry * remove patch * add failing tmp port to get CI logs for qtwebengine .... * try deactivating jumbo build * add patch to fix std issue * remove tmp port * v db * deactivate qtspeech on x86 & windows due to call conv * v db
microsoft · Jan 10, 2023 · 79c5f02 · 79c5f02
1 parent 468b093
commit 79c5f02
Show file tree

Hide file tree

Showing 94 changed files with 484 additions and 145 deletions.
diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "Qt",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -62,6 +62,7 @@
       ]
     },
     "qtinterfaceframework",
+    "qtlanguageserver",
     {
       "name": "qtlottie",
       "default-features": false,
@@ -138,6 +139,11 @@
     "qtserialbus",
     "qtserialport",
     "qtshadertools",
+    {
+      "name": "qtspeech",
+      "default-features": false,
+      "platform": "!(windows & x86)"
+    },
     "qtsvg",
     {
       "name": "qttools",

diff --git a/ports/qt3d/vcpkg.json b/ports/qt3d/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt3d",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "Qt wrapper for existing OPC UA stacks",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5compat",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "The module contains unsupported Qt 5 APIs",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtactiveqt",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "ActiveQt",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtapplicationmanager",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "Qt component for application lifecycle management",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtbase/cmake/qt_port_data.cmake b/ports/qtbase/cmake/qt_port_data.cmake
@@ -1,42 +1,44 @@
-set(qtbase_HASH "d5c85a8b05dd32912e213b1c51c928e6bde0ac64cdef1649419f02522604988add9d8e45baa770f53790b5477e6e43e4e66e69db7f2e0c1081a48cfa4052b4af")
-set(qttools_HASH "10ece151d78583976284b0b0c156d6309b0e381e8232a96ef26e71ea0616d9b14e2860c68285ddf263ce8f3aed41147ade7c0c12c061e959a163f46e8ae99cd5")
-set(qtdeclarative_HASH "56440642161473903aa606b3350c27f5de652923588b83f157613daceabff3bcf2950c4a1e976bc8b6de674534061703a069d7359db6e92e27fade66167bdf41")
-set(qtsvg_HASH "fa9d5f13c1aefc31d29303b2e32ef3a35e9a50ab98a5e263a2a12bf645d63546daf5d131a892ed8648aa231d3a837a5319f00e82800ca4bee7344a4d94e6305f")
-set(qt5compat_HASH "b858e9c9a756e598a5d56be7bc59e1e2814ff1ef15ed69e29b3a840263ce99a2ce6931dfb9e9f7c6ff90f074abe07208188e0a8929acf2632623931c5183769b")
-set(qtshadertools_HASH "3064a311601a2bbb3396e96ba5c27bb29b5c25e41cae7c4b736cc1e1e32ef6b5aa455ec8b0d3cb7b02f7472b133e4ef23627bdf2e60c188f07595edff15f7c87")
-set(qtquicktimeline_HASH "b155e476b41a9619b6512ab5daeec10219e6e9eb2a0da6874c69a25f463a092a258e32712213192b613fefbc54278807251c75e7e9eb3f811145532cfb8a8229")
-set(qtquick3d_HASH "c62226eb1744c0213a901fcf4b56cb3cfa27c5b25881b8f068dbf8e0ed0846e7775e768fe97fe0dfe1ce3d3d4815700b2f3d75d6626d2ac3db1a6328995e454d")
-set(qttranslations_HASH "67c8afe30a3d443dd4771292393c2fd24c4770f86bf02da1392fd05779230f058582728858adde86ffe08c8c46a842e23fec8248e25020b25677cc2dc0e5bc1a")
-set(qtwayland_HASH "6b238f269c77f86f31ef97a4f34d36ff26fd59d68cc8df98862658a972fdd3946dfb1301cdd310d5223c55c9ebb767fdb4c30793c5de6e1ba243c896b2964803")
-set(qtdoc_HASH "6dff4d96f2912bfe3a9df50dfd3168b4505a030c3492f55dc698dfb1d6926aba9ba0b83359cd1c2e4c72df6db1150f7a5d66b5f79f0b6925a3206f823b0c3544")
-set(qtcoap_HASH "1a46e5347e76980ba3c7beb4901e5acf32440ec6750b0c12cf6c33adc31ba201d0a474d22de4e906caebf517349f8118e2224080c6fcc6f573ca2f9ad58a062c")
-set(qtopcua_HASH "0e727260b28a429d6910b66a95becabcb2e955c9a6b2e15288b8ae2fbf5c7bb937bcffd64bf56554b9da59b5b5f01cda44d964d2dbb7be822bcad9b132b05541")
-set(qtimageformats_HASH "f47a716e0854aeecab1edc5fc523f35d2b600b74d3e363b21505531414832ebe4ebfce28377b3b023d31878b3a693dd7b72c0e990fadfb939429bd6d372fda88")
-set(qtmqtt_HASH "c8f5c05d82a1ab85abc9bb34cd1ad27cabe9eabdb336f477b5169519cc570b55f828258c310c43eb9a2089d03635219a51afb66177a505962ced0ccda05eeb10")
-set(qtnetworkauth_HASH "ee073c8876f9c9b8178e281854bfc51e7f4cb39d9c4332ef82464bdfcd9150b54fd8308dccd72347796c6db8e50331134745e5dee855d6cfe85ed36111d450bf")
-set(qt3d_HASH "f82497d13843766169a1bdca2afe224ba858b26f3307d08c3df40673bab1a3bb998491627ab19ed4680e0894c48d5e15796c24e269cd028df17f5a27f09a0c56")
-set(qtactiveqt_HASH "ae637d797fd532e25f9d8698aa8c1f173778ea482d8e1450376b76dd3ee0ac2a326751b99014cc8730f933d9124db5e74adb5048bfb52e51466907c87cd589f9")
-set(qtdatavis3d_HASH "acb0cad5eecdec73d0f197a6312ce240a20712ec17e3fa8b21b7c84d0e248edda3e38b4f47f4cd70b1107e9229ace27fd3c198630346cbe21e27dc3bb6c11ef4")
-set(qtdeviceutilities_HASH "760238a07d3b1f91814be35496f6d00601eb293c6c28de657d36a2b2e78781cccce66620f5e1c56c73d99efd9c9ed0c1459bf37d29666d086c6fa122b265679b")
-set(qtlottie_HASH "d7b44f9bc403aa1f4252709b6d08a438d042fce67fbfab56b36509a158e07a364ad169a2fa2b6d5bc40c33abc2dab4a7dfa566be1b882c7564d317196bb45e42")
-set(qtscxml_HASH "c08182fd24f8f303ae85ae9ad20f544597d9c75bedbfd17e0f160905badfa388c0a0e0724abec2c75d0a0c2c224898393871fb12f11c6c6c5bc4f2ebbb2bd056")
-set(qtvirtualkeyboard_HASH "f6d0a7cf4e790ffabfc07c9d669d3d2edf12bca4f48015797a87819a6b9bad215448376637ff0cda14185846d0d2208ebc5a2efa34aa7ea0e85a3eb618919111")
-set(qtcharts_HASH "82464182f28cb9ff68cd39ee5fe7bd44c892abde25a6d3f8b1e1a6f49bb83638ab646978b5f8341fc63edde4d4b27dba98a9775083662bb764bc52f4f2bb87e9")
-set(qtconnectivity_HASH "dd94337565407a5e09ff4845e688ad012867fc6410f18eb63ba503542c6267d62fb08c109e1e84febc5c7f86e389ebfc724c45ad99f3469617edd51b5caa8b7c")
-set(qtpositioning_HASH "aa169e65202efdebfe5e926756c055ff6868ee61f150f2053b30bd63565550fd4e52dc5533365d3b64e4234631503bc1b63af003fcdc81fe103236dfeccdb47f")
-set(qtmultimedia_HASH "f221bedaf997b413e1fa8a984503b03839ac731c99e9ab4233871acde57b0fd66b64ec401448505b25e6c1a5313b594a01b65ba9af0047ed008a2fea8e40d6c9")
-set(qtremoteobjects_HASH "3f62e8d4ae33d237d9fbf7615ad72435958026d79ea9e336858093d77c255069a3180f472442168bff7db9b6d161f42d9130809ad01df07e74f4de85c7ea4749")
-set(qtsensors_HASH "14242fd6bed762cdb74f5de4736d3238ec3bebafec30502e1096388e7c0c0f88e5881e3b3cab30ddd304c693ecf076b307fd5e1f75cd67c4898eca1eab71339d")
-set(qtserialbus_HASH "2852889b9ae59dcd0032e6907751ef58735f80ba904ad51623b6fc82be1087e0231d63b830f945694d6b643822d9473ce7b7e0846abbfb91cbcd43ad2c78673d")
-set(qtserialport_HASH "87d6082bca60905a05407c307f8a39862b80a937d92aad73c8f100f34b54f0f99056434144257e525b7c32aab5c849004bb7b3560af11e9e739c24a1fd21c125")
-set(qtwebchannel_HASH "a412fc0786da23090a841b10cc7f6543df3ee5817e81d520de49beec53bf71083f0d36dfa39955e525a87d153b7a0bb9bb2e3dab2106816eb3f39d25ab2b27f2")
-set(qtwebengine_HASH "1d46294a0c817a3b41ab4e759fdb1ebb7a52816ca77b1ad042da3de1c5d59ab3dadcd723e90aa8d8f15da20896faf9e2b590e0922b4c6098484f0ecb9e36471d")
-set(qtwebsockets_HASH "87cc770994cdc8215a55c6ac926340e9ab5f08d8c2de176e363cac5dc0efddac0a7d077fca9135e3139d9e2a663bce2d5501b086ae0b99561adbaea403ad16dc")
-set(qtwebview_HASH "59267a0d08e6ef44f9f5b726e03818665e26a8d76e80fc13b16a357e75c4de1ed8cadaf0e8fd3ee4429eaff3aed841b2709885dbd345c8bdb835bad83449a981")
-set(qtinterfaceframework_REF e52edc48d0abcbc708b021c928fd6434feb9ab73)
-set(qtapplicationmanager_HASH "7c79be96f29a7fb82032fb28b1c3550c6eb916bbd0d7deac82f79ceca6a91ac41327e72f441195780f578b091c3928be9d2b110c0b8baf12ff202155c0d19049")
-set(qthttpserver_HASH "838447298fc7d2a7fc6812ab839d00f8ecb7ab21cba5e4923a8d6ef64ee0fc36e12f44b99cb52f84aaad1b06cc35fcd866d179feb85f8fc2bd2107ab37e509ba")
-set(qtquick3dphysics_REF 15016644649fbb8d08a6165fa8c99dfe5b8a66ca)
+set(qtbase_HASH "b00cce7bfc29d3a34c9a2f08db147c4bfd962e178916d60033e1845b25eaeaa4fbd42f5c1d7e39453ddb412a4e91c22c8eae52745eda8a47e35a691054d5496e")
+set(qttools_HASH "303da2e7d58d213b8a5d4f4e36c7903b57ea8011f711cfb598b79414a6da1e3cc5e47a26a34ff1bdf82e07cb4f5274bd45297b880c380e6a3de3df42837a2c2c")
+set(qtdeclarative_HASH "76742b8b0902802c1d7615c8b7948b245a535c5f9574893d0fc5f8e09cb914578c1243be23dee37f98bd037e9407f82bc71b22b688067aaa68efcec1db8f922a")
+set(qtsvg_HASH "9b9de3f19a6c98d61ec1b4ba1883aada3b57db8e2ce56a493b6d7c639ed49a43f51c16b11f65cf8ee7ba8c8f4c61e1eedebb99c8645acfcc934048f2eb76fe64")
+set(qt5compat_HASH "8aa49cbbe92e628be3b502bbf0a9668b7664829a12c8cf0eced816cda880d034d567f287d2a1bd1efb7d693b3de7e583d2c2d69e2437cdeda737c67d7949ca56")
+set(qtshadertools_HASH "ba35c07c253b0c009be297173996327c3bfc27711112d5190f4a7b7c4b5af2f0ee339ed35107139d65a751646a911b499afff2faa04ccd7802b3d7e7aa38ce10")
+set(qtquicktimeline_HASH "dd7f9b09312f7f94e18aa127f49d389eac183cc03f80d01dcd0faa5db2852d0bb12a9f6070543ede93b986649f455e90c4288d992bcd024f82213782f9bfda5e")
+set(qtquick3d_HASH "286606571f45a0464a57893880f805a2510ebea9a3cfb92e5225eeb3f9435b2c4d4919ce53c45dcea6ed8f7a9e84dd4afa0a5f631dbc26b3723da637260bb6af")
+set(qttranslations_HASH "6c29e1e934a62b803c4316e308b1b09c03d1cdbe823197ed2f192db32b195d9451f19e2985e66a312c7f2929c99946055efb3b3e8aa06617bb82e4e786bd91e3")
+set(qtwayland_HASH "29d3f3e7fade666bcd3145106f1d782122ac3fcf94811d25917c9f45af0dc8cddb3c2149545344d91e86f86490029555758ed2e180f241703251c22c7ec15122")
+set(qtdoc_HASH "8cbc2b1adb27be0b4c2081ab174c89beef71e0670f0c7f176186fc7aaa7d0f80c935d658cb1f181efd8fe1f0cc53f37cfe9bedf9353143a5d4e072be5452924d")
+set(qtcoap_HASH "5751faf9b332512fb14cbb16899048e167c13433bc5e2db7f1017cc6553ddaa8e0003e5c8e9e2e183111c6c725eaec8999e7dc589296dd7d55d1dbc88fa647cd")
+set(qtopcua_HASH "db1c866ff8b681e79eeb6d8b046a19f69081193926b089bcb225e3dc7c8380fc33323a5344d77672871c1b784067496466c776145810aafa865acaf1ca07c600")
+set(qtimageformats_HASH "2bda0001295d1a27ee3018d7a7236525ee41f7de33d58805a71277b5a7d8f9506687a7bb9d6630e32cbcb89e340048591e9f9d29833a3bb4d8168c4779dc5320")
+set(qtmqtt_HASH "2ea6306cd0e849b2651978d7f2acc10913ee90c73511693992617e25bdbdb030277a00f0d653d0eca2189f3a9a590cbefc300050639d852c5f37b1d3004804cf")
+set(qtnetworkauth_HASH "2a5155cc98f710b5bdb6cb56fca79732dbe8ca37901b4148bc6273a48a7b48dbe846eb2559e8221d52a98723b6bbd5e87d725af22f215985677857fd50064bcc")
+set(qt3d_HASH "cfea707b4c4deff581f5163bd1fa9eed296e569a6790cf93d2431c693849f223219f6691df5701e3b537d3a85970e7458392c01cc8a31a44bc6a23683d0e8b5f")
+set(qtactiveqt_HASH "c0ed3a0de7414d93ebf56658b48d1319eb857e7484cde1cd1e59259b6f7f2176e7e7e721e7fceca6b17c1d23271c37ddc27d56a245dd2f09fbf2a84f98f0aaae")
+set(qtdatavis3d_HASH "c818da5b3707d6b52509d6ec884d93ed1dae5de5d9350aa57d8010adb0d5c9aeff41bb4bb0c1951571a7b7b1b462f0695405dd2ff3a257e68d0edabb9945fbcb")
+set(qtdeviceutilities_HASH "dae9c370a181bdb4ce99f5f7d50687400587d3e19725bc8e45546eb1a1901b020cd2b56767fec945529925ffad14a5f7d8c21790f184b42670eef0da35cb419d")
+set(qtlottie_HASH "1315f8e38ca52b0189446e396f3c24df03bf55dc3bacbd53d29176ef958d6091ed6e686f61336584103d67b44ab9e502adc117086891cc229a3c0a457671da49")
+set(qtscxml_HASH "06190676c593f6a9e050a55bf22f51a83d63ad5e6eed5c4482438569aad347a851506c4a0b95d881e2a37e9a26747b7d1d3cee6fb627747aac7fd9f2510776e0")
+set(qtvirtualkeyboard_HASH "97dcd12768f8a6f62a38ccc96aee289a06852400525746321a567a1a048a7f6da58919511658fbe5e9d183381324c4566e9c19d35091d6cd5b0011c21bbc4a6c")
+set(qtcharts_HASH "b3ee07e4a745d0bf657cc0b7419df3511446a2f7fbfa5cf98e7ae0af479214528bb19fea7b9f68f5a3f975b89b2df10cb0c7a6b709170b5d910bc38466c4b35e")
+set(qtconnectivity_HASH "8b6312120773aa813abb8211734ac473ec1038dcb48fe7b57840a4c7aa706842c27f3ff42d4ec6597e1b38dd680a4d620c9adfb4d52da974ac7feca535af0cc8")
+set(qtpositioning_HASH "3f45416c10b437572167374cf1450d8ff138f16028e2f338ea4458de4cd05ba71b7de286f7ffacd8b1808ee78b41afb975cb168a0d27077c981dc1bef1e4d412")
+set(qtmultimedia_HASH "3d89ef97e9c58e9e6de61d3410d382cd2427835d26993a79368790b2aeff572fe1924d4cf9468fe3b7be232f99acb24668fe4d42df654df04af8f3d03d18f851")
+set(qtremoteobjects_HASH "c8e57842a1922bcb52ccb242671e8e76cb23dd7e0e63d508bfcfd98a3ca1d9cf9a7067cb233a084f7d450c784c2d1dfdd39ffa866daefc88837b2e665d54c87d")
+set(qtsensors_HASH "569bef821a1a309289c2b3c2fc4b8eaa5051886d01d31d20ee99f6b33da1c0cb7eb7e692f9ea0ff5423f5de064f2b471b6594b4ef0b1353b6b11551055728b50")
+set(qtserialbus_HASH "fc6a73ea438cb54d3b11a3ca3d6b23a8459a2de821a1fd2dfcca2fc7f18032093964d9508359e23e530647585d9780614b07e20127412798bb6caf42a0e5d76a")
+set(qtserialport_HASH "d8b33d89e78abf34766f8d37d114641e2aec90ebe7d82dd1246f453b87b266545b1679450fd8f3ab7967a348fda098179b63a6d9ec34eb5ce56d8e8b242a251f")
+set(qtwebchannel_HASH "5cde582d77c55bdf4d69a31f04b293c267da00f6a18ab0d677ea1b9b6348cddca8fb9ad453128607f5dc191aeb5e685d8d8fbcade0affeb54ec2fd06035a5c75")
+set(qtwebengine_HASH "47b184a690d4fa5ccccaa3533903068df7b28825aeb16b7c75e3c7cc29fe0cfdf07501c5f0311926c22852f626b0cd59c836d44527261dc7d5c1efbf7e15439b")
+set(qtwebsockets_HASH "3d9b9a800151385e30a54289606ed430e322a8e8f4401b57a28fd194ccd0346b13151155b9c50780233dc89e6b3a639f1c30fe5fc7c71dc1d614398be4f9315c")
+set(qtwebview_HASH "0e6240eb7b2d22865ff57c1a9d2d16878c795d2db38223e0469ee7d8a655f65d9fa35e1cb8b9a55144bfcbd201e2cc0de5c1dd4d624d1652da783fe57b99ccb3")
+set(qtinterfaceframework_REF f7cd47ac8651069148d833476c865d612718bb76)
+set(qtapplicationmanager_HASH "d52eeb928b171e92889fa7c90c01d5b9045717f2bd025328d0a840ba6b351637a01c646a6532254f6811c69b20c93a1621cb362d9bfca985ffcb7b4536bd15e0")
+set(qtlanguageserver_HASH "f1c46ea7dd6c0e44dd5a5bbe38fb0ab627e21c050dfb4cc691ff805decf084a5321a970d8151d00dd58eac574f46d74fafbda2e1bd2beb1bba9281481c852603")
+set(qthttpserver_HASH "3742e7ebcb551832abc63c3baae5cce99f6c319a6c7b3058e791754eaa5c882cf567d181e3bb63242b55fd9fb458b828e4f8fb0e8fd0aafb4426608a87e51090")
+set(qtquick3dphysics_REF 78d7fe9e85689f87bcd311c941ba2167ef4bc136)
+set(qtspeech_HASH "e9d39902124d3f6155db0ed73e826b28dffd830bd5be7675cf13e02443d4939e27d8d5abfe0cbe204f11286e5db7c81ed19a48ae46f36b1c51c5456e05c76db0")
 
 # Not in newer releases
 set(qtlocation_HASH "a5508da406ec6fb413dc63aa29ddffed0dbd10f0344c8f10231e68178d21b6986e4cf983eb180a40bfd48bef1731e295c0722b31b6495aebe6edc18f7fa55629")

diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake
@@ -7,7 +7,8 @@
 ## 6. The build should fail with "Done downloading version and emitting hashes." This will have changed out the vcpkg.json versions of the qt ports and rewritten qt_port_data.cmake
 ## 7. Set QT_UPDATE_VERSION back to 0
 
-set(QT_VERSION 6.4.1)
+set(QT_VERSION 6.4.2)
+set(QT_DEV_BRANCH 0)
 
 set(QT_UPDATE_VERSION 0)
 
@@ -74,11 +75,17 @@ if(QT_VERSION VERSION_GREATER_EQUAL 6.2.2)
              qtinterfaceframework
              qtapplicationmanager)
 endif()
+if(QT_VERSION VERSION_GREATER_EQUAL 6.3.0)
+    list(APPEND QT_PORTS
+             ## New in 6.3.0
+             qtlanguageserver)
+endif()
 if(QT_VERSION VERSION_GREATER_EQUAL 6.4.0)
     list(APPEND QT_PORTS
              ## New in 6.4.0
              qthttpserver
-             qtquick3dphysics)
+             qtquick3dphysics
+             qtspeech)
 endif()
 # 1. By default, modules come from the official release
 # 2. These modules are mirrored to github and have tags matching the release
@@ -100,7 +107,11 @@ function(qt_get_url_filename qt_port out_url out_filename)
         set(filename "qt-${qt_port}-${QT_VERSION}.tar.gz")
     else()
         string(SUBSTRING "${QT_VERSION}" 0 3 qt_major_minor)
-        set(url "https://download.qt.io/archive/qt/${qt_major_minor}/${QT_VERSION}/submodules/${qt_port}-everywhere-src-${QT_VERSION}.tar.xz")
+        if(NOT QT_DEV_BRANCH)
+            set(url "https://download.qt.io/archive/qt/${qt_major_minor}/${QT_VERSION}/submodules/${qt_port}-everywhere-src-${QT_VERSION}.tar.xz")
+        else()
+            set(url "https://download.qt.io/development_releases/qt/${qt_major_minor}/${QT_VERSION}/submodules/${qt_port}-everywhere-src-${QT_VERSION}.tar.xz")
+        endif()
         set(filename "${qt_port}-everywhere-src-${QT_VERSION}.tar.xz")
     endif()
     set(${out_url} "${url}" PARENT_SCOPE)

diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "qtbase",
-  "version": "6.4.1",
-  "port-version": 5,
+  "version": "6.4.2",
   "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtcharts",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "QtCharts module",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtcoap",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "Qt CoAP client module",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtconnectivity/vcpkg.json b/ports/qtconnectivity/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtconnectivity",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "Qt Connectivity",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtdatavis3d",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "Qt 3D data visualization framework",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtdeclarative",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "Qt Declarative (Quick 2)",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtdeviceutilities/vcpkg.json b/ports/qtdeviceutilities/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtdeviceutilities",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "Utils for Boot2Qt",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtdoc",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "Qt Documentation",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qthttpserver/vcpkg.json b/ports/qthttpserver/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qthttpserver",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "Qt Extension: Qt HTTP Server",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "qtimageformats",
-  "version": "6.4.1",
-  "port-version": 1,
+  "version": "6.4.2",
   "description": "Additional Image Format plugins for Qt",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtinterfaceframework",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "Qt Interface Framework",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtlanguageserver/portfile.cmake b/ports/qtlanguageserver/portfile.cmake
@@ -0,0 +1,12 @@
+set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
+include("${SCRIPT_PATH}/qt_install_submodule.cmake")
+
+set(${PORT}_PATCHES)
+set(TOOL_NAMES)
+
+qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
+                     TOOL_NAMES ${TOOL_NAMES}
+                     CONFIGURE_OPTIONS_MAYBE_UNUSED
+                         QT_BUILD_EXAMPLES
+                         QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS
+                    )
diff --git a/ports/qtlanguageserver/vcpkg.json b/ports/qtlanguageserver/vcpkg.json
@@ -0,0 +1,25 @@
+{
+  "name": "qtlanguageserver",
+  "version": "6.4.2",
+  "description": "An implementation of the Language Server Protocol",
+  "homepage": "https://www.qt.io/",
+  "license": null,
+  "dependencies": [
+    {
+      "name": "qtbase",
+      "default-features": false,
+      "features": [
+        "concurrent",
+        "network"
+      ]
+    },
+    {
+      "name": "qtbase",
+      "default-features": false,
+      "features": [
+        "gui"
+      ],
+      "platform": "android"
+    }
+  ]
+}
diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtlocation",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "Qt Location",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtlottie",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "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/",
   "license": null,

diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtmqtt",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "qtmultimedia",
-  "version": "6.4.1",
-  "port-version": 1,
+  "version": "6.4.2",
   "description": "Qt Multimedia",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtnetworkauth",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "Qt Network Authenticators; QtOAuth in particular",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtopcua",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "Qt wrapper for existing OPC UA stacks",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtpositioning",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "Qt Positioning",
   "homepage": "https://www.qt.io/",
   "license": null,