Merge remote-tracking branch 'origin/master' into ninja

microsoft · BillyONeal · Jan 15, 2025 · Jun 13, 2024 · Jun 13, 2024 · Nov 6, 2024
commit e9f7985e47ea0af583fd969cd8f29eb7f3983ab2
diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-webengine",
-  "version": "5.15.15",
+  "version": "5.15.16",
   "port-version": 1,
   "description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.",
   "license": null,

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -934,7 +934,8 @@ qt5-canvas3d:x64-windows=skip
 qt5-canvas3d:x64-windows-static=skip
 qt5-canvas3d:x64-windows-static-md=skip
 qt5-canvas3d:x86-windows=skip
-# Long build time, ninja trouble
+# Skipped to avoid exceeding the 48 hour time limit in CI
+# May also need an older ninja version
 qt5-webengine:x64-windows=skip
 qt5-webengine:x86-windows=skip
 # Missing system libraries

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7513,7 +7513,7 @@
       "port-version": 0
     },
     "qt5-webengine": {
-      "baseline": "5.15.15",
+      "baseline": "5.15.16",
       "port-version": 1
     },
     "qt5-webglplugin": {

diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json
@@ -1,10 +1,15 @@
 {
   "versions": [
     {
-      "git-tree": "8c0302ffbef2d114f867ba6b0b34cfe1de78bb44",
-      "version": "5.15.15",
+      "git-tree": "92f56035f25cfc039d74c70b6905c1b78e480e2e",
+      "version": "5.15.16",
       "port-version": 1
     },
+    {
+      "git-tree": "b49c1e293ead06cecbbc431801688483b0473f3e",
+      "version": "5.15.16",
+      "port-version": 0
+    },
     {
       "git-tree": "eeece45f507ad36455883b753c5914ef7e266c26",
       "version": "5.15.15",