-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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.
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
Patch macdeployqt #5488
Conversation
|
||
if (plugins && !deploymentInfo.qtPath.isEmpty()) { | ||
- deploymentInfo.pluginPath = deploymentInfo.qtPath + "/plugins"; | ||
+ deploymentInfo.pluginPath = QLibraryInfo::location(QLibraryInfo::PluginsPath); |
There was a problem hiding this comment.
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()
.
Thanks ! Could you please report the bug at bugreports.qt.io, and submit the patch for review at codereview.qt.io ? |
This comment has been minimized.
This comment has been minimized.
The issue has already been adressed here: qt/qttools@03abcba Shall I generate the patch from this commit instead ? Do we agree that the CI failure has nothing to do with my change ? |
That would be ideal. |
Unfortunately, the patch doesn't apply correctly, probably due to the fact that other commits have modified the file: git log --oneline v5.15.2..dev src/macdeployqt/macdeployqt/main.cpp
03abcbabb macdeployqt: Fix plugin resolution bugs for non-standard installs
e6ad15080 Merge remote-tracking branch 'origin/5.15' into dev
b2f3eb655 Merge remote-tracking branch 'origin/5.15' into dev
6b2f32f3d Fix Qt6 build |
Co-authored-by: ericLemanissier <ericLemanissier@users.noreply.github.com>
This comment has been minimized.
This comment has been minimized.
@ericLemanissier I fixed the patch because it looks like the QLibraryInfo class changed in Qt 6:
Should I submit a patch to the 5.15 branch ? |
All green in build 3 (
|
I detected other pull requests that are modifying qt/5.x.x recipe: This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there. |
Is there missing for this PR to be accepted ? |
My only question is will there be another 5.x.x release that will include this fix in the near future? If no, I'll approve 🙃 |
@prince-chrismc Qt company has announced that updates to qt 5.15 will only available to commercial customers. So it is not very likely that we will get a new 5.x release. Although I think KDE maintains a Qt 5.15 fork with patches. |
* Patch macdeployqt fix conan-io#5487 * Update recipes/qt/5.x.x/patches/fix-macdeployqt.diff Co-authored-by: ericLemanissier <ericLemanissier@users.noreply.github.com> * QLibraryInfo::path => location Co-authored-by: ericLemanissier <ericLemanissier@users.noreply.github.com>
Specify library name and version: qt/5.15.2
This is also a good place to share with all of us why you are submitting this PR (specially if it is a new addition to ConanCenter): is it a dependency of other libraries you want to package? Are you the author of the library? Thanks!
conan-center hook activated.
fix #5487