Fix AppImage packaging when linuxdeploy-plugin-qt picks a Qt 5 qmake#1037
Open
saberoueslati wants to merge 3 commits intodail8859:masterfrom
Open
Fix AppImage packaging when linuxdeploy-plugin-qt picks a Qt 5 qmake#1037saberoueslati wants to merge 3 commits intodail8859:masterfrom
saberoueslati wants to merge 3 commits intodail8859:masterfrom
Conversation
Owner
|
Thanks for the PR. I would assume building this on a system with both Qt5 and Qt6 installed isn't very common (I could be wrong) so is there a simpler solution to this maybe? Maybe instead of finding qmake6...if there's some way to just detect this issue and then have cmake abort and print some message to tell the user to set the QMAKE variable? E.g. (untested) |
Contributor
Author
|
@dail8859 I'll work on it later this evening |
Contributor
Author
|
@dail8859 I simplified as asked, now if a QT version different than 6 is detected first, the following message is produced : |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #1036
Summary
This fixes the Linux AppImage packaging step for environments where both Qt 5 and Qt 6 tooling are installed.
linuxdeploy-plugin-qtcan auto-detect/usr/bin/qmake, which may point to Qt 5 even though NotepadNext is built with Qt 6. In that case, the AppImage build can fail with:What changed
cmake/PackagingLinux.cmaketo resolve a Qt 6-compatibleqmakeQt6::qmakeCMake target first when it is availableqmake6andqmake-qt6qmake -query QT_VERSIONQMAKE=...to the AppImage packaging step only when the selected binary is confirmed to be Qt 6qmakecan be resolved