Skip to content

Conversation

@fanquake
Copy link
Member

Backports #11995 and #12946 so that qt (and all depends) can still be built on the 0.15 branch.

@fanquake fanquake added this to the 0.15.2 milestone Apr 26, 2018
@murrayn
Copy link
Contributor

murrayn commented May 6, 2018

utACK 93b9a61

@Sjors
Copy link
Member

Sjors commented May 6, 2018

tACK 93b9a61. Without these two commits macOS depends build fails during QT build.

Also, fwiw, BitcoinQT also still builds for me on the 0.15 branch, using the depends.

macOS 10.13.4 with XCcde 9.3

@ken2812221
Copy link
Contributor

utACK 93b9a61

@laanwj laanwj merged commit 93b9a61 into bitcoin:0.15 May 15, 2018
laanwj added a commit that referenced this pull request May 15, 2018
93b9a61 depends: Fix Qt build with XCode 9.3 (fanquake)
9bb1a16 [Depends] Fix Qt build with Xcode 9.2 (fanquake)

Pull request description:

  Backports #11995 and #12946 so that qt (and all depends) can still be built on the 0.15 branch.

Tree-SHA512: 671cce790b5f72c8edd04461d0bc3d300557c4df8c4e5d338561a972333edb34e2009f221d581fe3b2e61080cce0891588831c00c16d4ab852730f65856a3054
@fanquake fanquake deleted the 0-15-depends-qt-backport branch June 17, 2018 08:24
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants