Add packages to ease Qt6 Kiwix-Desktop compil. #273
Merged
Conversation
This file contains 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
adamlamar
reviewed
Jan 3, 2025
| ENV QT_SELECT qt5 | ||
| # Set Qt6 per default (QT_SELECT has to be set to Qt5 so Kiwix Linux/Windows compiles) | ||
| RUN qtchooser -install qt6 $(which qmake6) | ||
| ENV QT_SELECT qt6 |
There was a problem hiding this comment.
Is the intent to make Qt6 the default with jammy, but then override the kiwix-desktop build on jammy to use qt5? Or to build with both Qt5 and Qt6 on jammy? Right now using the jammy container implies Qt5.
There was a problem hiding this comment.
The intent on Jammy is to:
- be able to build with either with qt6 or qt5
- per default, without any additional work it should compile with qt6
- CD will compile with qt6 and CI with qt5
adamlamar
approved these changes
Jan 5, 2025
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.
We want to ease Qt6 based Kiwix Desktop 2.5.0+ compilation.
See kiwix/kiwix-build#594