Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

msvc: Define the same QT_... macros as in Autotools builds #29044

Merged
merged 1 commit into from
Dec 11, 2023
Merged

msvc: Define the same QT_... macros as in Autotools builds #29044

merged 1 commit into from
Dec 11, 2023

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Dec 9, 2023

There are no reasons to have such a diversion.

Also it fixes #28960 (comment).

@DrahtBot
Copy link
Contributor

DrahtBot commented Dec 9, 2023 •
edited
Loading

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK sipsorcery, TheCharlatan

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

@hebasto hebasto mentioned this pull request Dec 9, 2023
Merged
@sipsorcery
Copy link
Contributor

@hebasto what version of QT are you using for Windows builds?

It's been a while since I did a QT build and I'm having lots of challenges with 5.15.11 on master.

@hebasto
Copy link
Member Author

hebasto commented Dec 9, 2023 •
edited
Loading

@hebasto what version of QT are you using for Windows builds?

Qt 5.15.11

It's been a while since I did a QT build and I'm having lots of challenges with 5.15.11 on master.

I've just done another Qt 5.15.11 build today with no issues.

@sipsorcery
Copy link
Contributor

tACK 1a5dae6.

TheCharlatan
TheCharlatan approved these changes Dec 11, 2023
View reviewed changes
Copy link
Contributor

@TheCharlatan TheCharlatan left a comment

Choose a reason for hiding this comment

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

ACK 1a5dae6

Thank you @hebasto, this fixes the build failure of #28960.

@fanquake fanquake merged commit ba5f16e into bitcoin:master Dec 11, 2023
16 checks passed
@hebasto hebasto deleted the 231209-msvc-qt branch December 11, 2023 12:15
@bitcoin bitcoin locked and limited conversation to collaborators Dec 10, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@TheCharlatan TheCharlatan TheCharlatan approved these changes

Assignees
No one assigned
Labels
Build system Windows
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@hebasto @DrahtBot @sipsorcery @TheCharlatan @fanquake