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

[depends] Fix QT build on OSX #9574

Merged
merged 1 commit into from
Jan 26, 2017
Merged

[depends] Fix QT build on OSX #9574

merged 1 commit into from
Jan 26, 2017

Conversation

fanquake
Copy link
Member

This should be enough to fix the depends QT build on OSX.

cc @theuni

Fixes #9126

@fanquake fanquake requested a review from theuni January 18, 2017 11:36
theuni
theuni reviewed Jan 18, 2017
View reviewed changes
Copy link
Member

@theuni theuni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fanquake Only the second was actually needed for me, is the libcocoa.a change necessary now that we aren't missing symbols? I kinda doubt it, since it's got a typo (p -> cp) :P

@fanquake
Copy link
Member Author

fanquake commented Jan 20, 2017 •
edited
Loading

@theuni not sure how I ended up pushing the borked patch. I had one instance where it looked like I still needed the libcocoa.a change, but it seems that plugin has been there all along. Fixed this up to include only the printer changes.

@theuni
Copy link
Member

theuni commented Jan 20, 2017

Thanks for testing. ACK c36ec71

@laanwj laanwj merged commit c36ec71 into bitcoin:master Jan 26, 2017
laanwj added a commit that referenced this pull request Jan 26, 2017
@laanwj
Merge #9574: [depends] Fix QT build on OSX
5ac6687 
c36ec71 depends: qt: disable printer for all platforms, not just osx (Cory Fields)
@fanquake fanquake deleted the fix-osx-depends-build branch January 28, 2017 16:49
codablock pushed a commit to codablock/dash that referenced this pull request Jan 21, 2018
@laanwj @codablock
Merge bitcoin#9574: [depends] Fix QT build on OSX
e09d5db 
c36ec71 depends: qt: disable printer for all platforms, not just osx (Cory Fields)
@sickpig sickpig mentioned this pull request Jun 5, 2018
Merged
@fanquake fanquake mentioned this pull request Nov 30, 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 theuni left review comments

Assignees
No one assigned
Labels
Build system macOS
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Depends built QT isn't being properly picked up on OS X
3 participants
@fanquake @theuni @laanwj