From 332f6fd3e7e56db31ea49770a5fa169fe19c10a8 Mon Sep 17 00:00:00 2001 From: Tom Savage Date: Tue, 29 Oct 2019 23:11:20 +0000 Subject: [PATCH 1/2] [qt5] Modify qtdeploy to include qtquickshapes Qt 5.10 introduced the QtQuick.Shapes module. The qtdeploy tool copies the QML plugin (`qmlshapesplugin.dll`) into the build directory, but a second required dll (`Qt5QuickShapes.dll`) is not copied over. This change adds this missing dll to the list of QtQuick-associated dlls to deploy. --- ports/qt5-base/qtdeploy.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/qtdeploy.ps1 b/ports/qt5-base/qtdeploy.ps1 index c751e891e0..117456a147 100644 --- a/ports/qt5-base/qtdeploy.ps1 +++ b/ports/qt5-base/qtdeploy.ps1 @@ -69,7 +69,7 @@ function deployPluginsIfQt([string]$targetBinaryDir, [string]$QtPluginsDir, [str } } } elseif ($targetBinaryName -match "Qt5Quickd?.dll") { - foreach ($a in @("Qt5QuickControls2", "Qt5QuickControls2d", "Qt5QuickTemplates2", "Qt5QuickTemplates2d")) + foreach ($a in @("Qt5QuickControls2", "Qt5QuickControls2d", "Qt5QuickShapes", "Qt5QuickShapesd", "Qt5QuickTemplates2", "Qt5QuickTemplates2d")) { if (Test-Path "$binDir\$a.dll") { From 4ad478783b15d7b4b7029dfc4f9342ea7cf7033b Mon Sep 17 00:00:00 2001 From: Tom Savage Date: Sat, 2 Nov 2019 12:44:15 +0000 Subject: [PATCH 2/2] [qt5] Bump version in qt5-base --- ports/qt5-base/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 8c0cc6c5ab..c981e7256a 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,5 +1,5 @@ Source: qt5-base -Version: 5.12.5-1 +Version: 5.12.5-2 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl