[qtbase] Fix Qt6 for MacOS (#41435)

microsoft · Nov 28, 2024 · 9d196b2 · 9d196b2
1 parent dbdc9b3
commit 9d196b2
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 5 deletions.
diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qt",
   "version": "6.8.0",
+  "port-version": 1,
   "description": "A cross-platform application and UI framework.",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -86,7 +87,10 @@
       "name": "qtmultimedia",
       "default-features": false,
       "features": [
-        "gstreamer"
+        {
+          "name": "gstreamer",
+          "platform": "linux"
+        }
       ],
       "platform": "!windows"
     },

diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake
@@ -12,6 +12,10 @@ if(VCPKG_TARGET_IS_ANDROID AND NOT ANDROID_SDK_ROOT)
     message(FATAL_ERROR "${PORT} requires ANDROID_SDK_ROOT to be set. Consider adding it to the triplet." )
 endif()
 
+if(VCPKG_TARGET_IS_OSX AND (NOT VCPKG_OSX_DEPLOYMENT_TARGET OR VCPKG_OSX_DEPLOYMENT_TARGET VERSION_GREATER_EQUAL "15.0"))
+    message(WARNING "Qt6 does not yet cleanly support macOS 15.0, consider adding set(VCPKG_OSX_DEPLOYMENT_TARGET 14.0) or earlier to a custom triplet (https://learn.microsoft.com/en-us/vcpkg/users/examples/overlay-triplets-linux-dynamic#overriding-default-triplets).")
+endif()
+
 function(qt_download_submodule_impl)
     cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "" "SUBMODULE" "PATCHES")
 

diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qtbase",
   "version": "6.8.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Qt Base (Core, Gui, Widgets, Network, ...)",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qtmultimedia",
   "version": "6.8.0",
+  "port-version": 1,
   "description": "Qt Multimedia is an add-on module that provides a rich set of QML types and C++ classes to handle multimedia content.",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7358,7 +7358,7 @@
     },
     "qt": {
       "baseline": "6.8.0",
-      "port-version": 0
+      "port-version": 1
     },
     "qt-advanced-docking-system": {
       "baseline": "4.3.1",
@@ -7554,7 +7554,7 @@
     },
     "qtbase": {
       "baseline": "6.8.0",
-      "port-version": 1
+      "port-version": 2
     },
     "qtcharts": {
       "baseline": "6.8.0",
@@ -7630,7 +7630,7 @@
     },
     "qtmultimedia": {
       "baseline": "6.8.0",
-      "port-version": 0
+      "port-version": 1
     },
     "qtnetworkauth": {
       "baseline": "6.8.0",

diff --git a/versions/q-/qt.json b/versions/q-/qt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c35f477d2ccb76098f070d81c1c5fea927f82c1c",
+      "version": "6.8.0",
+      "port-version": 1
+    },
     {
       "git-tree": "4d00d6076204ab4ff6ced71ce747a8f9562094da",
       "version": "6.8.0",

diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2fa35617d1e8e0f1ab1d7ace5e16fd91b8e6746c",
+      "version": "6.8.0",
+      "port-version": 2
+    },
     {
       "git-tree": "572380eee3c59c2656423fac304568537b7358d3",
       "version": "6.8.0",

diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a51e63dedb6ec8c9efd9cb344cc4de79a3bfe17d",
+      "version": "6.8.0",
+      "port-version": 1
+    },
     {
       "git-tree": "2c1cba855635b5668c261be35a7b5544f6c60c85",
       "version": "6.8.0",