Skip to content

Backport: Fix Qt build with XCode (for depends) - #2325

Merged
UdjinM6 merged 3 commits into
dashpay:developfrom
UdjinM6:bp13093
Sep 30, 2018
Merged

Backport: Fix Qt build with XCode (for depends)#2325
UdjinM6 merged 3 commits into
dashpay:developfrom
UdjinM6:bp13093

Conversation

@UdjinM6

@UdjinM6 UdjinM6 commented Sep 26, 2018

Copy link
Copy Markdown

This backports bitcoin#13093


QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const
--
2.16.3 No newline at end of file

@PastaPastaPasta PastaPastaPasta Sep 26, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

shouldn't there be an newline here?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Technically, yes, but I was just backporting them as is :) Should be fixed now.

@codablock codablock left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

utACK

@UdjinM6
UdjinM6 merged commit 8a1b513 into dashpay:develop Sep 30, 2018
CryptoCentric pushed a commit to absolute-community/absolute that referenced this pull request Mar 13, 2019
* [Depends] Fix Qt build with Xcode 9.2

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

* depends: Fix Qt build with XCode 9.3

GitHub-Pull: bitcoin#12946
Rebased-From: 5b4fc3e

* add newline
@UdjinM6
UdjinM6 deleted the bp13093 branch November 26, 2020 13:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants