Prepare CMake for Qt6 #3103
Merged
Prepare CMake for Qt6 #3103
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
zneix
commented
Aug 1, 2021
pajlada
reviewed
Aug 1, 2021
zneix
added a commit
to SevenTV/chatterino7
that referenced
this pull request
Aug 8, 2021
Now we're on commit a216e11; Changes from upstream we've pulled: - Minor: Remove TwitchEmotes.com attribution and the open/copy options when right-clicking a Twitch Emote. (Chatterino#2214, Chatterino#3136) - Minor: Strip leading @ and trailing , from username in /user and /usercard commands. (Chatterino#3143) - Minor: Display a system message when reloading subscription emotes to match BTTV/FFZ behavior (Chatterino#3135) - Bugfix: Moderation mode and active filters are now preserved when opening a split as a popup. (Chatterino#3113, Chatterino#3130) - Bugfix: Fixed a bug that caused all badge highlights to use the same color. (Chatterino#3132, Chatterino#3134) - Dev: Renamed CMake's build option `USE_SYSTEM_QT5KEYCHAIN` to `USE_SYSTEM_QTKEYCHAIN`. (Chatterino#3103) - Dev: Add benchmarks that can be compiled with the `BUILD_BENCHMARKS` CMake flag. Off by default. (Chatterino#3038) - Dev: Allow building against Qt 5.11 (Chatterino#3105)
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.
Pull request checklist:
CHANGELOG.mdwas updated, if applicableDescription
Renamed variables of QT5KEYCHAIN to just QTKEYCHAIN due to how qt keychain library changes its target name from
qt5keychaintoqt6keychainif we build against Qt6.⚠ Important note: qtkeychain already uses
BUILD_WITH_QT6CMake parameter, so I thought it would be convenient to just reuse that. No idea if that's a bad practice to use one variable/option that affects multiple things at once, but pretty sure that in this scope it wouldn't change anything.Required for Chatterino/libcommuni#2