Skip to content

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Apr 8, 2022

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-qt against Qt 6.2.4 fir now, suggesting to reviewers to verify changes for Qt 5 only.

hebasto added 3 commits April 9, 2022 01:11
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).
Copy link
Contributor

@shaavan shaavan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 6312575

Going commit wise:

  1. The first commit removes that unnecessary importing of the <QActionGroup> library in the walletview.cpp file where it was unused and add an appropriate import statement in bitcoingui.cpp where it is being used in the file. guiutil.cpp is using the QStandardPaths library. Hence, it is also appropriately imported into this PR.
  2. 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.

Screenshot from 2022-04-10 21-57-50

  1. I was able to verify that this Qt::ItemIsTristate is deprecated, and Qt::ItemIsAutoTristate replaces its usage. I am attaching a reference screenshot from Qt 5 documentation.

Screenshot from 2022-04-10 21-52-00

I successfully compiled and ran the bitcoin core GUI from this PR without any errors or warnings.

Copy link
Member

@jarolrod jarolrod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK 6312575

Tested changes on linux, macOS, and windows. Confirmed no change in behavior and confirmed deprecation statuses with Qt docs

@hebasto hebasto added the Qt 6 Transition to Qt 6 label Apr 12, 2022
@hebasto hebasto merged commit f60a63c into bitcoin-core:master Apr 12, 2022
@hebasto hebasto deleted the 220409-qt6 branch April 13, 2022 15:30
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Apr 13, 2022
@bitcoin-core bitcoin-core locked and limited conversation to collaborators Apr 13, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Qt 6 Transition to Qt 6
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants