[Qt 6.2] Update Qt6 to 6.2 #18687

Neumann-A · 2021-06-28T20:05:31Z

Just testing and seeing what fails.

[cmake] Update to 3.21.1 #18955 (required for static builds to work correctly.)
update linux Ci to 20.04 LTS due to gcc 7.5 being unsupported (using osx as a benchmark for that for now)
~~add node to osx machine for qtwebengine~~
waiting for merge of [rollup:2021-08-09] Rollup PR #19469

… uppercase Q

# Conflicts: # versions/q-/qtbase.json

xavier2k6 · 2021-07-02T14:57:40Z

slightly off-topic: Qt 6.1.2 officially released.

# Conflicts: # ports/qt/vcpkg.json # ports/qtactiveqt/vcpkg.json # ports/qtbase/cmake/qt_install_submodule.cmake # ports/qtbase/vcpkg.json # ports/qttools/portfile.cmake # ports/qtvirtualkeyboard/vcpkg.json # ports/qtwayland/vcpkg.json

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff

diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json
index 0175521..c579521 100644
--- a/ports/qtmultimedia/vcpkg.json
+++ b/ports/qtmultimedia/vcpkg.json
@@ -20,8 +20,8 @@
     "gstreamer": {
       "description": "Build with gstreamer",
       "dependencies": [
-        "gstreamer",
-        "angle"
+        "angle",
+        "gstreamer"
       ]
     },
     "qml": {

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for qttools but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: aeacc8ed34e798f5d73df932e09b1b619d89910b
-- New SHA: 005f1b3f95e8bf752d4b90752e0e9a0a6094b767
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtmqtt but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: fffa3edc4b989f223176e6c5fd37692361b3b713
-- New SHA: b65f7f9ef60242935642626b59742b90d01639b6
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtscxml but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: c8e642305ce89691d07946081ac77aa3216dc418
-- New SHA: b677e158e24e8b7721737349f8a3e5816f5cd650
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtnetworkauth but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: 9793619e1a8167daa86e50d533b0ec3d1a843568
-- New SHA: 39b7b8d42db3e59c81fc12d8ccbde6fe61355488
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtdatavis3d but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: 30c282e8438df69e77b4e2a6935addb778bc761c
-- New SHA: a913ca9bd7ebc67922ab9c443ff261f8fe9fb011
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qttranslations but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: 754d6279d7b7c6f7a3b976d90cba153fb12d036e
-- New SHA: ba86ae412d975fe8803c9e741f4cc212bbafa03f
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtcharts but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: f40ae8925f5dc6cf6947fd0a14f607eff3c0438a
-- New SHA: 862778156be2dccae4aba9e85a0d638ad7321fc6
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtquick3d but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: c9871c8665ce287463902e6aa56b6f8b5836cd46
-- New SHA: 4d2dfaa7ad410ce7e65dc6dad1f439209a748f5f
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtdeclarative but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: a4c4e942686e20cc25f4f608c7f423b295a11830
-- New SHA: bbf83a640dd676d428a402f5e8ad52176b8b0efc
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qt5compat but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: 215bfc596de54c9c4b5c83e1d8d4ab53ddfaba72
-- New SHA: a13adad650150a15e809cfc908e1724650773042
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtquickcontrols2 but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: cdf33560d3def651acf48341ea6dc0447c270c5b
-- New SHA: dd4d994f46490853aa4f4ae0132357f55272b27f
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtdoc but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: c393da11dd6c6cbdbc01b32e123327a9971fa353
-- New SHA: dca784a2d0e21e6ff6c2089dd10c1bdd5bcdccda
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtlottie but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: 4c9e0cf0663bfb60c9f99f44302e0934c2e325bb
-- New SHA: 336bc148f154110bf7e1880e038b1380996af4d2
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtimageformats but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: 37b1ff899c20c104a1987dff249c7b51755e4fc4
-- New SHA: 33eb6ca1c53ab998f4bd043a0781f433f16c862d
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtcoap but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: e51f03a5c9c142390aea35d1a6389383c245414f
-- New SHA: d767b4f2b434b49ddc3f69a7ef8cea59890445e2
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtopcua but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: 3112bdb7d0ff9c2e023dd15446975806ffc9a87a
-- New SHA: fc236cf257f736c0fc43758bbbeb74da0ba2eb07
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout e201002b4f4827d7b7b672f0c5c672a77fc3b77d -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 03050a4..2e0777f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5253,7 +5253,7 @@
       "port-version": 1
     },
     "qt": {
-      "baseline": "6.1.3",
+      "baseline": "6.2.0-beta4",
       "port-version": 0
     },
     "qt-advanced-docking-system": {
@@ -5441,11 +5441,11 @@
       "port-version": 0
     },
     "qtactiveqt": {
-      "baseline": "6.1.3",
+      "baseline": "6.2.0-beta4",
       "port-version": 0
     },
     "qtbase": {
-      "baseline": "6.1.3",
+      "baseline": "6.2.0",
       "port-version": 0
     },
     "qtcharts": {
@@ -5456,6 +5456,10 @@
       "baseline": "6.1.3",
       "port-version": 0
     },
+    "qtconnectivity": {
+      "baseline": "6.2.0-beta1",
+      "port-version": 0
+    },
     "qtdatavis3d": {
       "baseline": "6.1.3",
       "port-version": 0
@@ -5476,6 +5480,10 @@
       "baseline": "0.11.1",
       "port-version": 1
     },
+    "qtlocation": {
+      "baseline": "6.2.0-beta1",
+      "port-version": 0
+    },
     "qtlottie": {
       "baseline": "6.1.3",
       "port-version": 0
@@ -5484,6 +5492,10 @@
       "baseline": "6.1.3",
       "port-version": 0
     },
+    "qtmultimedia": {
+      "baseline": "6.2.0-beta4",
+      "port-version": 0
+    },
     "qtnetworkauth": {
       "baseline": "6.1.3",
       "port-version": 0
@@ -5504,10 +5516,26 @@
       "baseline": "6.1.3",
       "port-version": 0
     },
+    "qtremoteobjects": {
+      "baseline": "6.2.0-beta1",
+      "port-version": 0
+    },
     "qtscxml": {
       "baseline": "6.1.3",
       "port-version": 0
     },
+    "qtsensors": {
+      "baseline": "6.2.0-beta1",
+      "port-version": 0
+    },
+    "qtserialbus": {
+      "baseline": "6.2.0-beta1",
+      "port-version": 0
+    },
+    "qtserialport": {
+      "baseline": "6.2.0-beta1",
+      "port-version": 0
+    },
     "qtshadertools": {
       "baseline": "6.1.3",
       "port-version": 0
@@ -5525,12 +5553,28 @@
       "port-version": 0
     },
     "qtvirtualkeyboard": {
-      "baseline": "6.1.3",
+      "baseline": "6.2.0-beta4",
       "port-version": 0
     },
     "qtwayland": {
-      "baseline": "6.1.3",
-      "port-version": 2
+      "baseline": "6.2.0-beta4",
+      "port-version": 0
+    },
+    "qtwebchannel": {
+      "baseline": "6.2.0-beta1",
+      "port-version": 0
+    },
+    "qtwebengine": {
+      "baseline": "6.2.0-beta2",
+      "port-version": 0
+    },
+    "qtwebsockets": {
+      "baseline": "6.2.0-beta1",
+      "port-version": 0
+    },
+    "qtwebview": {
+      "baseline": "6.2.0-beta1",
+      "port-version": 0
     },
     "quadtree": {
       "baseline": "2020-04-13",
@@ -6748,6 +6792,10 @@
       "baseline": "2021-04-02",
       "port-version": 1
     },
+    "vcpkg-tool-nodejs": {
+      "baseline": "14.17.4",
+      "port-version": 0
+    },
     "vectorclass": {
       "baseline": "2.00.01",
       "port-version": 1
diff --git a/versions/q-/qt.json b/versions/q-/qt.json
index 922dbed..80bfdef 100644
--- a/versions/q-/qt.json
+++ b/versions/q-/qt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3f2d58a7da4df8caf75212efb299f48318e018ec",
+      "version-semver": "6.2.0-beta4",
+      "port-version": 0
+    },
     {
       "git-tree": "7af9212716c1c55de883178c890121a7d804cc48",
       "version-semver": "6.1.3",
diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json
index 0e6ef81..1107440 100644
--- a/versions/q-/qtactiveqt.json
+++ b/versions/q-/qtactiveqt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fcab069148bcbf84cc6e78b10b8a90cdb5a42109",
+      "version-semver": "6.2.0-beta4",
+      "port-version": 0
+    },
     {
       "git-tree": "925f4777d7eb69e9fa1d6de9af0fdf3e4511799f",
       "version-semver": "6.1.3",
diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index 16a8e0e..2f694f4 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "78942d1eb2ae3ab1b7e966262bbe1ed207069f8e",
+      "version-semver": "6.2.0",
+      "port-version": 0
+    },
     {
       "git-tree": "23812ecb279c5ae29a26e99f2ccc605bbe17f45a",
       "version-semver": "6.1.3",
diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json
index b635eb7..9ce9de4 100644
--- a/versions/q-/qtvirtualkeyboard.json
+++ b/versions/q-/qtvirtualkeyboard.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ca0e06ba0301e9aa7a9e708971a5684c1cc051c0",
+      "version-semver": "6.2.0-beta4",
+      "port-version": 0
+    },
     {
       "git-tree": "09bccb97807efe784799cac5346a90fcc16d5517",
       "version-semver": "6.1.3",
diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json
index 7444323..3923c3d 100644
--- a/versions/q-/qtwayland.json
+++ b/versions/q-/qtwayland.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0c26a5ae49050c04542aedf549e537e4d41963ee",
+      "version-semver": "6.2.0-beta4",
+      "port-version": 0
+    },
     {
       "git-tree": "a2e96d86ddc71f8fe862d70d4c685416cfb3479d",
       "version-semver": "6.1.3",

remove outdated patches format qtmultimedia

…rd party deps fails due to x64 intrinsics.)

Neumann-A · 2021-09-29T18:41:03Z

@autoantwort I assume that the discussion in discord around default-features has been resolved and my usage is right just that vcpkg-tool has a bug around it?

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for qt5compat but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: 215bfc596de54c9c4b5c83e1d8d4ab53ddfaba72
-- New SHA: a13adad650150a15e809cfc908e1724650773042
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtdeclarative but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: a4c4e942686e20cc25f4f608c7f423b295a11830
-- New SHA: c22fa41dcbc801f2b0c914d5fdbfe71c1928cb04
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtlottie but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: 4c9e0cf0663bfb60c9f99f44302e0934c2e325bb
-- New SHA: 336bc148f154110bf7e1880e038b1380996af4d2
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtopcua but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: 3112bdb7d0ff9c2e023dd15446975806ffc9a87a
-- New SHA: fc236cf257f736c0fc43758bbbeb74da0ba2eb07
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtquickcontrols2 but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: cdf33560d3def651acf48341ea6dc0447c270c5b
-- New SHA: dd4d994f46490853aa4f4ae0132357f55272b27f
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtscxml but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: c8e642305ce89691d07946081ac77aa3216dc418
-- New SHA: b677e158e24e8b7721737349f8a3e5816f5cd650
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtnetworkauth but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: 9793619e1a8167daa86e50d533b0ec3d1a843568
-- New SHA: 39b7b8d42db3e59c81fc12d8ccbde6fe61355488
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtcoap but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: e51f03a5c9c142390aea35d1a6389383c245414f
-- New SHA: d767b4f2b434b49ddc3f69a7ef8cea59890445e2
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtquick3d but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: c9871c8665ce287463902e6aa56b6f8b5836cd46
-- New SHA: d7ed9097d178758272b6ff60b90292468660fbff
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtdatavis3d but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: 30c282e8438df69e77b4e2a6935addb778bc761c
-- New SHA: a913ca9bd7ebc67922ab9c443ff261f8fe9fb011
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtimageformats but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: 37b1ff899c20c104a1987dff249c7b51755e4fc4
-- New SHA: 33eb6ca1c53ab998f4bd043a0781f433f16c862d
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtdoc but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: c393da11dd6c6cbdbc01b32e123327a9971fa353
-- New SHA: dca784a2d0e21e6ff6c2089dd10c1bdd5bcdccda
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtmqtt but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: fffa3edc4b989f223176e6c5fd37692361b3b713
-- New SHA: b65f7f9ef60242935642626b59742b90d01639b6
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qttools but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: aeacc8ed34e798f5d73df932e09b1b619d89910b
-- New SHA: 005f1b3f95e8bf752d4b90752e0e9a0a6094b767
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qttranslations but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: 754d6279d7b7c6f7a3b976d90cba153fb12d036e
-- New SHA: ba86ae412d975fe8803c9e741f4cc212bbafa03f
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtcharts but no changes to version or port version.
-- Version: 6.1.3
-- Old SHA: f40ae8925f5dc6cf6947fd0a14f607eff3c0438a
-- New SHA: 862778156be2dccae4aba9e85a0d638ad7321fc6
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 9b6135efafdc26c77f35a8dc4e6db18a8174e662 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 854de77e..6f5813bd 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5357,7 +5357,7 @@
       "port-version": 1
     },
     "qt": {
-      "baseline": "6.1.3",
+      "baseline": "6.2.0-beta4",
       "port-version": 0
     },
     "qt-advanced-docking-system": {
@@ -5545,11 +5545,11 @@
       "port-version": 0
     },
     "qtactiveqt": {
-      "baseline": "6.1.3",
+      "baseline": "6.2.0-beta4",
       "port-version": 0
     },
     "qtbase": {
-      "baseline": "6.1.3",
+      "baseline": "6.2.0",
       "port-version": 0
     },
     "qtcharts": {
@@ -5560,6 +5560,10 @@
       "baseline": "6.1.3",
       "port-version": 0
     },
+    "qtconnectivity": {
+      "baseline": "6.2.0-beta1",
+      "port-version": 0
+    },
     "qtdatavis3d": {
       "baseline": "6.1.3",
       "port-version": 0
@@ -5580,6 +5584,10 @@
       "baseline": "0.11.1",
       "port-version": 1
     },
+    "qtlocation": {
+      "baseline": "6.2.0-beta1",
+      "port-version": 0
+    },
     "qtlottie": {
       "baseline": "6.1.3",
       "port-version": 0
@@ -5588,6 +5596,10 @@
       "baseline": "6.1.3",
       "port-version": 0
     },
+    "qtmultimedia": {
+      "baseline": "6.2.0-beta4",
+      "port-version": 0
+    },
     "qtnetworkauth": {
       "baseline": "6.1.3",
       "port-version": 0
@@ -5608,10 +5620,26 @@
       "baseline": "6.1.3",
       "port-version": 0
     },
+    "qtremoteobjects": {
+      "baseline": "6.2.0-beta1",
+      "port-version": 0
+    },
     "qtscxml": {
       "baseline": "6.1.3",
       "port-version": 0
     },
+    "qtsensors": {
+      "baseline": "6.2.0-beta1",
+      "port-version": 0
+    },
+    "qtserialbus": {
+      "baseline": "6.2.0-beta1",
+      "port-version": 0
+    },
+    "qtserialport": {
+      "baseline": "6.2.0-beta1",
+      "port-version": 0
+    },
     "qtshadertools": {
       "baseline": "6.1.3",
       "port-version": 0
@@ -5629,12 +5657,28 @@
       "port-version": 0
     },
     "qtvirtualkeyboard": {
-      "baseline": "6.1.3",
+      "baseline": "6.2.0-beta4",
       "port-version": 0
     },
     "qtwayland": {
-      "baseline": "6.1.3",
-      "port-version": 2
+      "baseline": "6.2.0-beta4",
+      "port-version": 0
+    },
+    "qtwebchannel": {
+      "baseline": "6.2.0-beta1",
+      "port-version": 0
+    },
+    "qtwebengine": {
+      "baseline": "6.2.0-rc2",
+      "port-version": 0
+    },
+    "qtwebsockets": {
+      "baseline": "6.2.0-beta1",
+      "port-version": 0
+    },
+    "qtwebview": {
+      "baseline": "6.2.0-beta1",
+      "port-version": 0
     },
     "quadtree": {
       "baseline": "2020-04-13",
@@ -6876,6 +6920,10 @@
       "baseline": "2021-04-02",
       "port-version": 1
     },
+    "vcpkg-tool-nodejs": {
+      "baseline": "14.17.4",
+      "port-version": 0
+    },
     "vectorclass": {
       "baseline": "2.00.01",
       "port-version": 1
diff --git a/versions/q-/qt.json b/versions/q-/qt.json
index 922dbeda..80bfdef7 100644
--- a/versions/q-/qt.json
+++ b/versions/q-/qt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3f2d58a7da4df8caf75212efb299f48318e018ec",
+      "version-semver": "6.2.0-beta4",
+      "port-version": 0
+    },
     {
       "git-tree": "7af9212716c1c55de883178c890121a7d804cc48",
       "version-semver": "6.1.3",
diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json
index 0e6ef81b..1107440b 100644
--- a/versions/q-/qtactiveqt.json
+++ b/versions/q-/qtactiveqt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fcab069148bcbf84cc6e78b10b8a90cdb5a42109",
+      "version-semver": "6.2.0-beta4",
+      "port-version": 0
+    },
     {
       "git-tree": "925f4777d7eb69e9fa1d6de9af0fdf3e4511799f",
       "version-semver": "6.1.3",
diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index 16a8e0e8..2f20eab4 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e34f65af4c34047597d2eca809a87a0d2ddbd894",
+      "version-semver": "6.2.0",
+      "port-version": 0
+    },
     {
       "git-tree": "23812ecb279c5ae29a26e99f2ccc605bbe17f45a",
       "version-semver": "6.1.3",
diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json
index b635eb73..9ce9de48 100644
--- a/versions/q-/qtvirtualkeyboard.json
+++ b/versions/q-/qtvirtualkeyboard.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ca0e06ba0301e9aa7a9e708971a5684c1cc051c0",
+      "version-semver": "6.2.0-beta4",
+      "port-version": 0
+    },
     {
       "git-tree": "09bccb97807efe784799cac5346a90fcc16d5517",
       "version-semver": "6.1.3",
diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json
index 74443238..3923c3df 100644
--- a/versions/q-/qtwayland.json
+++ b/versions/q-/qtwayland.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0c26a5ae49050c04542aedf549e537e4d41963ee",
+      "version-semver": "6.2.0-beta4",
+      "port-version": 0
+    },
     {
       "git-tree": "a2e96d86ddc71f8fe862d70d4c685416cfb3479d",
       "version-semver": "6.1.3",

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

ports/qtbase/portfile.cmake
ports/qttools/portfile.cmake
ports/qtwebengine/portfile.cmake

xavier2k6 · 2021-09-30T09:25:39Z

@Neumann-A Qt 6.2.0 FINAL has been released now.

https://download.qt.io/official_releases/qt/

~~Nothing is on their blog yet with an announcement but plan was mentioned in the wiki & in their latest minutes of meetings confirmed it was still on track for release today......30th September.~~

Edit: Announced
https://www.qt.io/blog/qt-6.2-lts-released

https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.2.0/release-note.md

https://wiki.qt.io/Qt_6.2_Release#Qt_6.2_release_plan

https://lists.qt-project.org/pipermail/releasing/2021-September/002893.html

autoantwort · 2021-09-30T10:47:10Z

@autoantwort I assume that the discussion in discord around default-features has been resolved and my usage is right just that vcpkg-tool has a bug around it?

yes

Open issues: QtWebengine and cross builds.

github-actions

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

ports/qtbase/portfile.cmake
ports/qttools/portfile.cmake
ports/qtwebengine/portfile.cmake

github-actions

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

ports/qtbase/portfile.cmake
ports/qttools/portfile.cmake
ports/qtwebengine/portfile.cmake

BillyONeal · 2021-09-30T20:04:01Z

Thanks for the qt version update!

Now that vcpkg has artifact caching, meaning downloading artifacts usually doesn't have to leave the datacenter, there's no need to potentially dirty different runs with leftover downloads from each other. This resulted in some "impossible" results in microsoft/vcpkg#18687 where a previous PR run accidentially downloaded the Windows version of nodejs to /mnt/vcpkg-ci/downloads/node-v14.17.4-linux-x64.tar.xz

Neumann-A and others added 27 commits June 7, 2021 21:59

[qt6] Update to 6.1.1

d14f51c

version stuff

54e1587

Merge remote-tracking branch 'upstream/master' into update_qt6_6.1.1

0bb9d42

fix empty dir

cc1088a

update version

d566456

fix casing in qtbase

27e76e6

[libpq] add secure32.lib on windows

ff922a8

add clang-cl fix

65b899a

version stuff

36c3d44

fix flag removal by adding a space

c37e2af

version stuff

539e360

make qt6->Qt6 usage consistent since Qt6 refers to itself as Qt6 with…

86cad58

… uppercase Q

fix libpq wrapper opensll linkage on linux

452efc8

use policy to fix dependent ports

5929904

version stuff

e70457e

use upstream patch

6c0f30b

version stuff

d177ef0

fix source_location with clang-cl

24f9905

version stuff

09c0a77

Merge remote-tracking branch 'upstream/master' into update_qt6_6.2

b038ad8

# Conflicts: # versions/q-/qtbase.json

add all new modules

57dd575

add all modules to the qt port

7adf81e

Merge remote-tracking branch 'upstream/master' into update_qt6_6.2

ed7d369

push all the ports

9735224

fix patch

4c1d17b

Merge remote-tracking branch 'upstream/master' into update_qt6_6.2

88204ae

update ports

80339d8

NancyLi1013 assigned JackBoosY Jun 28, 2021

JackBoosY added the category:port-update The issue is with a library, which is requesting update new revision label Jun 29, 2021

github-actions bot requested changes Sep 14, 2021

View reviewed changes

Neumann-A added 3 commits September 14, 2021 13:08

[skip actions]

19fdd2c

remove outdated patches format qtmultimedia

Merge remote-tracking branch 'upstream/master' into update_qt6_6.2

6e62940

[skip actions] update to rc1

5992b4c

Neumann-A changed the title ~~[Qt 6.2|WIP|] Update Qt6 to 6.2(-beta4)~~ [Qt 6.2|WIP|] Update Qt6 to 6.2(-rc1) Sep 18, 2021

Neumann-A added 5 commits September 18, 2021 23:04

[skip actions] remove patch for now

8a300f8

Merge remote-tracking branch 'upstream/master' into update_qt6_6.2

ea0b9f7

update refs

00fb79f

[skip actions] comment patch to try another patch in qtmultimedia

79ede2a

x86 is not supported by qtwebengine (at least one of its internal thi…

8194915

…rd party deps fails due to x64 intrinsics.)

Neumann-A changed the title ~~[Qt 6.2|WIP|] Update Qt6 to 6.2(-rc1)~~ [Qt 6.2|WIP|] Update Qt6 to 6.2(-rc2) Sep 29, 2021

github-actions bot requested changes Sep 29, 2021

View reviewed changes

Neumann-A added 2 commits September 30, 2021 13:13

Finalize for 6.2 release.

401f47c

Open issues: QtWebengine and cross builds.

version stuff

3f0c478

Neumann-A changed the title ~~[Qt 6.2|WIP|] Update Qt6 to 6.2(-rc2)~~ [Qt 6.2] Update Qt6 to 6.2 Sep 30, 2021

Neumann-A added 2 commits September 30, 2021 13:15

fix semver in qtquickcontrols.

c01a906

version stuff

86fd0b6

github-actions bot approved these changes Sep 30, 2021

View reviewed changes

Neumann-A added 2 commits September 30, 2021 15:51

revise qtwebengine supports expression

99733db

update version

e5c1f2a

github-actions bot approved these changes Sep 30, 2021

View reviewed changes

Neumann-A marked this pull request as ready for review September 30, 2021 15:24

BillyONeal merged commit 35bfef7 into microsoft:master Sep 30, 2021

Neumann-A deleted the update_qt6_6.2 branch September 30, 2021 20:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Qt 6.2] Update Qt6 to 6.2 #18687

[Qt 6.2] Update Qt6 to 6.2 #18687

Neumann-A commented Jun 28, 2021 •

edited

Loading

xavier2k6 commented Jul 2, 2021

github-actions bot left a comment

Neumann-A commented Sep 29, 2021

github-actions bot left a comment

xavier2k6 commented Sep 30, 2021 •

edited

Loading

autoantwort commented Sep 30, 2021

github-actions bot left a comment

github-actions bot left a comment

BillyONeal commented Sep 30, 2021

[Qt 6.2] Update Qt6 to 6.2 #18687

[Qt 6.2] Update Qt6 to 6.2 #18687

Conversation

Neumann-A commented Jun 28, 2021 • edited Loading

xavier2k6 commented Jul 2, 2021

github-actions bot left a comment

Choose a reason for hiding this comment

Neumann-A commented Sep 29, 2021

github-actions bot left a comment

Choose a reason for hiding this comment

xavier2k6 commented Sep 30, 2021 • edited Loading

autoantwort commented Sep 30, 2021

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

BillyONeal commented Sep 30, 2021

Neumann-A commented Jun 28, 2021 •

edited

Loading

xavier2k6 commented Sep 30, 2021 •

edited

Loading