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

[0.18.2] Backport of #15706 #17054

Closed
wants to merge 1 commit into from
Closed

[0.18.2] Backport of #15706 #17054

wants to merge 1 commit into from

Conversation

lucayepa
Copy link
Contributor

@lucayepa lucayepa commented Oct 4, 2019

Backports #15706 to the 0.18 branch.

@lucayepa
Check QT library version
050b3e6 
Fixes issue bitcoin#15688

Due to a bug, in systems using pkg-config, the version of the Qt library is
not checked at configure time. Without any check, when Qt version is not
supported, the build process stops with unexplained errors.

This PR introduces the control of the version of the QT library, returning
a warning at configure time if the installed version is not supported.

Github-Pull: bitcoin#15706
Rebased-From: 25e43fc
@fanquake
Copy link
Member

fanquake commented Oct 4, 2019

This has been opened against the wrong branch (master instead of 0.18).

@lucayepa lucayepa changed the base branch from master to 0.18 October 4, 2019 19:20
@fanquake
Copy link
Member

fanquake commented Oct 4, 2019

Actually, if you wanted to change this to be against the 0.19 branch, I'll add the commit to #16617 for backporting to 0.18 once it's been merged into master.

@lucayepa lucayepa changed the base branch from 0.18 to 0.19 October 4, 2019 19:28
@lucayepa lucayepa changed the base branch from 0.19 to 0.18 October 4, 2019 19:28
@lucayepa
Copy link
Contributor Author

lucayepa commented Oct 4, 2019 •
edited
Loading

Yes. I open a new one for the backport to 0.19 branch: #17055

@lucayepa
Copy link
Contributor Author

lucayepa commented Oct 4, 2019

I guess cheks need to be run again.

@laanwj
Copy link
Member

laanwj commented Oct 5, 2019 •
edited
Loading

Thanks! But FWIW: If it's a clean backport, you don't need to open a separate PR for every branch, clean-backportable PRs that are marked for backport, will be collected into "backport PRs" by developers (like #16617) before a new release on that branch.

Edit: also, it makes sense to do the backport after merge to master to make sure it includes all the last changes.

@lucayepa
Copy link
Contributor Author

lucayepa commented Oct 5, 2019

Sure. I've seen the "needs backport" tags and I thought it was addressed to me. Thanks.

@fanquake
Copy link
Member

I don't think we need three PR open for the same change at the same time. I'm going to close this are pull the 0.18 backport into #16617 if this change gets merged into master.

@fanquake fanquake closed this Oct 24, 2019
@lucayepa
Copy link
Contributor Author

Agree. It's my fault...

@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
Backport Build system
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lucayepa @fanquake @laanwj