From 7e599d6fd3c56f3911d3662d8832e8d52f4857eb Mon Sep 17 00:00:00 2001
From: Martin Delille <martin@delille.org>
Date: Sun, 9 May 2021 15:36:57 +0200
Subject: [PATCH] Patch macdeployqt fix #5487

---
 recipes/qt/5.x.x/conandata.yml                |  2 ++
 recipes/qt/5.x.x/patches/fix-macdeployqt.diff | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 recipes/qt/5.x.x/patches/fix-macdeployqt.diff

diff --git a/recipes/qt/5.x.x/conandata.yml b/recipes/qt/5.x.x/conandata.yml
index 610312a1371bd..a37360194178a 100644
--- a/recipes/qt/5.x.x/conandata.yml
+++ b/recipes/qt/5.x.x/conandata.yml
@@ -12,3 +12,5 @@ patches:
       base_path: "qt5/qtbase"
     - patch_file: "patches/c72097e.diff"
       base_path: "qt5/qtwebengine"
+    - patch_file: "patches/fix-macdeployqt.diff"
+      base_path: "qt5/qttools"
diff --git a/recipes/qt/5.x.x/patches/fix-macdeployqt.diff b/recipes/qt/5.x.x/patches/fix-macdeployqt.diff
new file mode 100644
index 0000000000000..243a3419f1d31
--- /dev/null
+++ b/recipes/qt/5.x.x/patches/fix-macdeployqt.diff
@@ -0,0 +1,21 @@
+diff --git a/src/macdeployqt/macdeployqt/main.cpp b/src/macdeployqt/macdeployqt/main.cpp
+index 0f9164053..5d9e40e36 100644
+--- a/src/macdeployqt/macdeployqt/main.cpp
++++ b/src/macdeployqt/macdeployqt/main.cpp
+@@ -27,6 +27,7 @@
+ ****************************************************************************/
+ #include <QCoreApplication>
+ #include <QDir>
++#include <QLibraryInfo>
+ 
+ #include "../shared/shared.h"
+ 
+@@ -236,7 +237,7 @@ int main(int argc, char **argv)
+     }
+ 
+     if (plugins && !deploymentInfo.qtPath.isEmpty()) {
+-        deploymentInfo.pluginPath = deploymentInfo.qtPath + "/plugins";
++        deploymentInfo.pluginPath = QLibraryInfo::location(QLibraryInfo::PluginsPath);
+         LogNormal();
+         deployPlugins(appBundlePath, deploymentInfo, useDebugLibs);
+         createQtConf(appBundlePath);