Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch macdeployqt #5488

Merged
merged 3 commits into from
Jun 1, 2021
Merged

Patch macdeployqt #5488

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e599d6
Patch macdeployqt fix #5487
MartinDelille May 9, 2021
5229f03
Update recipes/qt/5.x.x/patches/fix-macdeployqt.diff
MartinDelille May 12, 2021
15b4572
QLibraryInfo::path => location
MartinDelille May 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions recipes/qt/5.x.x/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
21 changes: 21 additions & 0 deletions recipes/qt/5.x.x/patches/fix-macdeployqt.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From the visible design perspective - I think it'd be better to fill the pluginPath from the shared.cpp, at the same place as the qtPath.
Then, here you'd need to only check that !deploymentInfo.pluginPath.isEmpty().

LogNormal();
deployPlugins(appBundlePath, deploymentInfo, useDebugLibs);
createQtConf(appBundlePath);
MartinDelille marked this conversation as resolved.
Show resolved Hide resolved