backport: #11995 Fix Qt build with Xcode 9#12636
Merged
laanwj merged 2 commits intobitcoin:0.16from Mar 14, 2018
Merged
Conversation
Contributor
|
utACK b7d95037f42adb393881cea182814f9a8fc14879. There is some whitespace issue: |
GitHub-Pull: bitcoin#11995 Rebased-From: 2b1f794
fanquake
force-pushed
the
qt-fix-backport
branch
from
b7d9503 to
686cb86
Compare
Member
Author
|
Whitespace issue should be resolved. |
Member
|
Gah, still seems there's a whitespace issue. I think we should exclude |
GitHub-Pull: bitcoin#12442 Rebased-From: fafbf7f
Member
Author
|
Added a backport of #12442 so that Travis stops harassing us about patch whitespace on the 0.16 branch. |
laanwj
added a commit
that referenced
this pull request
Mar 14, 2018
f3b8d85 devtools: Exclude patches from lint-whitespace GitHub-Pull: #12442 Rebased-From: fafbf7f (MarcoFalke) 686cb86 [Depends] Fix Qt build with Xcode 9.2 (fanquake) Pull request description: GitHub-Pull: #11995 Rebased-From: 2b1f794 Tree-SHA512: 73d1c0a87fd135f3ad8bb737b97037ef047e582c41a7473833e82776957caf372fcd0caa764fc4eed792e9998e214ae829bad5535db6d589827085a74b0fa6f4
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
GitHub-Pull: #11995
Rebased-From: 2b1f794