Skip to content

build: Refactor out Qt version check macro #17837

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
Closed
hebasto wants to merge 2 commits into from
Closed

build: Refactor out Qt version check macro #17837

hebasto wants to merge 2 commits into from

Conversation

@hebasto
Copy link
Member

@hebasto hebasto commented Dec 31, 2019

This PR removes code that repeats three times.
Also currently on master (8830cb5) some parts are brittle:

bitcoin/build-aux/m4/bitcoin_qt.m4

Line 290 in 8830cb5

#if QT_VERSION_MINOR < 8

bitcoin/build-aux/m4/bitcoin_qt.m4

Line 387 in 8830cb5

#if QT_VERSION < 0x050600 || QT_VERSION_MINOR < 6

Also there is a little change that fixes a warning:

$ cat config.log | grep -A 2 'extra tokens'
conftest.cpp:76:28: warning: extra tokens at end of #ifndef directive
         #ifndef QT_VERSION OR QT_VERSION_STR
                            ^~

@hebasto
Copy link
Member Author

hebasto commented Dec 31, 2019

Closed in favor of #17820.

@hebasto hebasto closed this Dec 31, 2019
@hebasto hebasto mentioned this pull request Dec 31, 2019
Closed
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

Build system

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@hebasto @fanquake