Getting ready to Qt 6 (1/n)#577
Merged
hebasto merged 3 commits intobitcoin-core:masterfrom Apr 12, 2022
Merged
Conversation
This change is preparation for Qt 6, and it fixes an experimental build with Qt 6.2.4.
This change is preparation for Qt 6 where `+` has been deprecated, and it fixes an experimental build with Qt 6.2.4.
This change is preparation for Qt 6, and it fixes an experimental build with Qt 6.2.4. The `Qt::ItemIsTristate` value has been deprecated since 5.6.0 (see ae8406d82f541f6d9112bdac192e5e4e114d56aa upstream commit).
This was referenced Apr 8, 2022
shaavan
approved these changes
Apr 10, 2022
Contributor
shaavan
left a comment
shaavan
left a comment
There was a problem hiding this comment.
ACK 6312575
Going commit wise:
- The first commit removes that unnecessary importing of the
<QActionGroup>library in thewalletview.cppfile where it was unused and add an appropriate import statement inbitcoingui.cppwhere it is being used in the file.guiutil.cppis using the QStandardPaths library. Hence, it is also appropriately imported into this PR. - I successfully verified that the “+” is deprecated for the QKeySequence function in Qt 6. I have attached a reference screenshot from the official Qt 6 documentation.
- I was able to verify that this
Qt::ItemIsTristateis deprecated, andQt::ItemIsAutoTristatereplaces its usage. I am attaching a reference screenshot from Qt 5 documentation.
I successfully compiled and ran the bitcoin core GUI from this PR without any errors or warnings.
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
For Qt 5 all changes in this PR are refactoring. But for Qt 6 they are real bugfixes :)
As I do not provide anyway way to build
bitcoin-qtagainst Qt 6.2.4 fir now, suggesting to reviewers to verify changes for Qt 5 only.