[qt5] Fix qt5 dll missing (#27935)

* Fix qt5 quick deploy dll missing #16983 * Fix qt5 qml dialog #14712 * Add translations to qt5 default features * Add websockets to qt5 default features * Update qt5 and qt5-base port version * Fix port version
microsoft · Nov 22, 2022 · 11a9d85 · 11a9d85
1 parent 6b49f83
commit 11a9d85
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 4 deletions.
diff --git a/ports/qt5-base/qtdeploy.ps1 b/ports/qt5-base/qtdeploy.ps1
@@ -73,6 +73,15 @@ function deployPluginsIfQt([string]$targetBinaryDir, [string]$QtPluginsDir, [str
                 throw "FAILED"
             }
         }
+        foreach ($a in @("Qt5Quick", "Qt5Quickd", "Qt5QmlModels", "Qt5QmlModelsd", "Qt5QuickControls2", "Qt5QuickControls2d", "Qt5QuickShapes", "Qt5QuickShapesd", "Qt5QuickTemplates2", "Qt5QuickTemplates2d", "Qt5QmlWorkerScript", "Qt5QmlWorkerScriptd", "Qt5QuickParticles", "Qt5QuickParticlesd", "Qt5QuickWidgets", "Qt5QuickWidgetsd"))
+        {
+            if (Test-Path "$binDir\$a.dll")
+            {
+                deployBinary "$targetBinaryDir" "$binDir" "$a.dll"
+            }
+        }
+        deployPlugins "scenegraph"
+        deployPlugins "qmltooling"
     } elseif ($targetBinaryName -match "Qt5Quickd?.dll") {
         foreach ($a in @("Qt5QuickControls2", "Qt5QuickControls2d", "Qt5QuickShapes", "Qt5QuickShapesd", "Qt5QuickTemplates2", "Qt5QuickTemplates2d", "Qt5QmlWorkerScript", "Qt5QmlWorkerScriptd", "Qt5QuickParticles", "Qt5QuickParticlesd", "Qt5QuickWidgets", "Qt5QuickWidgetsd"))
         {

diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qt5-base",
   "version": "5.15.7",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Qt5 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/qt5/vcpkg.json b/ports/qt5/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qt5",
   "version": "5.15.7",
+  "port-version": 1,
   "description": "Qt5 Application Framework",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -142,9 +143,12 @@
             "imageformats",
             "multimedia",
             "networkauth",
+            "quickcontrols",
             "quickcontrols2",
             "svg",
-            "tools"
+            "tools",
+            "translations",
+            "websockets"
           ]
         }
       ]

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6062,7 +6062,7 @@
     },
     "qt5": {
       "baseline": "5.15.7",
-      "port-version": 0
+      "port-version": 1
     },
     "qt5-3d": {
       "baseline": "5.15.7",
@@ -6078,7 +6078,7 @@
     },
     "qt5-base": {
       "baseline": "5.15.7",
-      "port-version": 1
+      "port-version": 2
     },
     "qt5-canvas3d": {
       "baseline": "0",

diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5464e5c86a4d0f0e55e9962a0a4476669411fdaf",
+      "version": "5.15.7",
+      "port-version": 2
+    },
     {
       "git-tree": "03b57b46f1e3be1f7aa32cfe41ef54ace61cb87f",
       "version": "5.15.7",

diff --git a/versions/q-/qt5.json b/versions/q-/qt5.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ae86831b5413a334195f8751e78e2ad9fcbd4349",
+      "version": "5.15.7",
+      "port-version": 1
+    },
     {
       "git-tree": "6d75a3344bc8561e1764372d80f28fcc3bfd5ba7",
       "version": "5.15.7",