[qt5-tools] Fix build fail with mingw (#32707)

microsoft · Jul 24, 2023 · d297fa0 · d297fa0
1 parent 06cbd71
commit d297fa0
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 5 deletions.
diff --git a/ports/qt5-declarative/vcpkg.json b/ports/qt5-declarative/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qt5-declarative",
   "version": "5.15.10",
+  "port-version": 1,
   "description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.",
   "license": null,
   "dependencies": [
@@ -17,7 +18,7 @@
   "features": {
     "d3d12": {
       "description": "Provides a Direct3D 12 backend for the scenegraph.",
-      "supports": "windows"
+      "supports": "windows & !mingw"
     },
     "platform-default-features": {
       "description": "Enable platform-dependent default features",
@@ -27,7 +28,7 @@
           "features": [
             "d3d12"
           ],
-          "platform": "windows"
+          "platform": "windows & !mingw"
         }
       ]
     }

diff --git a/ports/qt5-tools/fix-pkgconfig-qt5uiplugin-not-found.patch b/ports/qt5-tools/fix-pkgconfig-qt5uiplugin-not-found.patch
@@ -0,0 +1,14 @@
+diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro
+index de0dc73..eef68be 100644
+--- a/src/designer/src/lib/lib.pro
++++ b/src/designer/src/lib/lib.pro
+@@ -1,7 +1,8 @@
+ TARGET = QtDesigner
+ MODULE = designer
+
+-QT = core-private gui-private widgets-private xml uiplugin
++QT = core-private gui-private widgets-private xml
++QT_PRIVATE += uiplugin
+
+ DEFINES += \
+     QDESIGNER_SDK_LIBRARY \
diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake
@@ -1,6 +1,9 @@
 include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
 
-qt_submodule_installation()
+qt_submodule_installation(
+    PATCHES
+        "fix-pkgconfig-qt5uiplugin-not-found.patch"
+)
 
 if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
     file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms")

diff --git a/ports/qt5-tools/vcpkg.json b/ports/qt5-tools/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qt5-tools",
   "version": "5.15.10",
+  "port-version": 1,
   "description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications",
   "license": null,
   "dependencies": [

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6646,7 +6646,7 @@
     },
     "qt5-declarative": {
       "baseline": "5.15.10",
-      "port-version": 0
+      "port-version": 1
     },
     "qt5-doc": {
       "baseline": "5.15.10",
@@ -6734,7 +6734,7 @@
     },
     "qt5-tools": {
       "baseline": "5.15.10",
-      "port-version": 0
+      "port-version": 1
     },
     "qt5-translations": {
       "baseline": "5.15.10",

diff --git a/versions/q-/qt5-declarative.json b/versions/q-/qt5-declarative.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c7cc59aec9e75dc548a741b01b94b13438904e99",
+      "version": "5.15.10",
+      "port-version": 1
+    },
     {
       "git-tree": "141dbdc4e7d234f55b336444a9e0a7f5add2e32b",
       "version": "5.15.10",

diff --git a/versions/q-/qt5-tools.json b/versions/q-/qt5-tools.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c3e934f75a0e506d6c3329e0fa0b2a56d6f71324",
+      "version": "5.15.10",
+      "port-version": 1
+    },
     {
       "git-tree": "994691ced838ba1d2eab1f5531e9ebfc4bd046f1",
       "version": "5.15.10",