Patch macdeployqt fix conan-io#5487

MartinDelille · May 9, 2021 · 7e599d6 · 7e599d6
1 parent 3ef9ab7
commit 7e599d6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git 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
@@ -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);