Skip to content

backport: #11995 Fix Qt build with Xcode 9 #12636

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
Merged
merged 2 commits into from
Mar 14, 2018
Merged

backport: #11995 Fix Qt build with Xcode 9 #12636

merged 2 commits into from
Mar 14, 2018

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Mar 7, 2018

GitHub-Pull: #11995
Rebased-From: 2b1f794

@fanquake fanquake added this to the 0.16.1 milestone Mar 7, 2018
@fanquake fanquake requested a review from theuni March 7, 2018 16:30
@jonasschnelli
Copy link
Contributor

utACK b7d95037f42adb393881cea182814f9a8fc14879.
Looks good, haven't tested though (currently no access to 10.13).

There is some whitespace issue:
https://travis-ci.org/bitcoin/bitcoin/jobs/350402801

@fanquake
Copy link
Member Author

Whitespace issue should be resolved.

@laanwj
Copy link
Member

laanwj commented Mar 14, 2018

Gah, still seems there's a whitespace issue.

diff --git a/depends/patches/qt/fix-cocoahelpers-macos.patch b/depends/patches/qt/fix-cocoahelpers-macos.patch
@@ -0,0 +1,70 @@
+
+
+
+
+
^---- failure generated from contrib/devtools/lint-whitespace.sh

I think we should exclude .patch files from the whitespace checks?

@fanquake
Copy link
Member Author

Added a backport of #12442 so that Travis stops harassing us about patch whitespace on the 0.16 branch.

@laanwj laanwj merged commit f3b8d85 into bitcoin:0.16 Mar 14, 2018
laanwj added a commit that referenced this pull request Mar 14, 2018
@laanwj
Merge #12636: backport: #11995 Fix Qt build with Xcode 9
845838c 
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
@fanquake fanquake deleted the qt-fix-backport branch April 12, 2018 02:02
@fanquake fanquake mentioned this pull request Apr 12, 2018
Merged
@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.
Reviewers

@theuni theuni Awaiting requested review from theuni

Assignees
No one assigned
Labels
Backport Build system
Projects
None yet
Milestone
0.16.1
Development

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