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.

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

[0.15] backport: depends qt patches #13093

Merged
merged 2 commits into from May 15, 2018

Conversation

Projects
None yet
5 participants
@fanquake
Copy link
Member

fanquake commented Apr 26, 2018

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

fanquake added some commits Nov 19, 2017

depends: Fix Qt build with XCode 9.3
GitHub-Pull: #12946
Rebased-From: 5b4fc3e

@fanquake fanquake added the Backport label Apr 26, 2018

@fanquake fanquake added this to the 0.15.2 milestone Apr 26, 2018

@murrayn

This comment has been minimized.

Copy link
Contributor

murrayn commented May 6, 2018

utACK 93b9a61

@Sjors

This comment has been minimized.

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

This comment has been minimized.

Copy link
Member

ken2812221 commented May 14, 2018

utACK 93b9a61

@laanwj laanwj merged commit 93b9a61 into bitcoin:0.15 May 15, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request May 15, 2018

Merge #13093: [0.15] backport: depends qt patches
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 fanquake:0-15-depends-qt-backport branch Jun 17, 2018

UdjinM6 added a commit to UdjinM6/dash that referenced this pull request Sep 25, 2018

Merge bitcoin#13093: [0.15] backport: depends qt patches
93b9a61 depends: Fix Qt build with XCode 9.3 (fanquake)
9bb1a16 [Depends] Fix Qt build with Xcode 9.2 (fanquake)

Pull request description:

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

Tree-SHA512: 671cce790b5f72c8edd04461d0bc3d300557c4df8c4e5d338561a972333edb34e2009f221d581fe3b2e61080cce0891588831c00c16d4ab852730f65856a3054

codablock added a commit to codablock/dash that referenced this pull request Sep 28, 2018

Merge bitcoin#13093: [0.15] backport: depends qt patches
93b9a61 depends: Fix Qt build with XCode 9.3 (fanquake)
9bb1a16 [Depends] Fix Qt build with Xcode 9.2 (fanquake)

Pull request description:

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

Tree-SHA512: 671cce790b5f72c8edd04461d0bc3d300557c4df8c4e5d338561a972333edb34e2009f221d581fe3b2e61080cce0891588831c00c16d4ab852730f65856a3054
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.