8000 depends: Fix Qt build with XCode 9.3 by fanquake · Pull Request #12946 · bitcoin/bitcoin · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

depends: Fix Qt build with XCode 9.3 #12946

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 1 commit into from
Apr 14, 2018
Merged

depends: Fix Qt build with XCode 9.3 #12946

merged 1 commit into from
Apr 14, 2018

Conversation

fanquake
Copy link
Member
@fanquake fanquake commented Apr 11, 2018 •
edited
Loading

Building Qt with Xcode 9.3 is currently broken with:

compiling kernel/qmacgesturerecognizer.cpp
fontdatabases/mac/qfontengine_coretext.mm:775:20: error: qualified reference to 'QFixed' is a constructor name rather than a type in this context
    return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
                   ^
compiling .moc/moc_qfbscreen_p.cpp
1 error generated.
make[2]: *** [.obj/qfontengine_coretext.o] Error 1
make[2]: *** Waiting for unfinished jobs....

This patch should fix that, and will hopefully be the last time we have to patch Qt 5.7.

I've only made minor adjustments from the original patch, so that it will apply, although still not completely cleanly. We can cleanup if required.

@fanquake fanquake requested a review from theuni April 11, 2018 15:05
@practicalswift
Copy link
Contributor

Concept ACK

@Sjors
Copy link
Member
Sjors commented Apr 11, 2018

I was initially confused by the PR description into thinking bitcoin-qt didn't build, but you're referring to QT itself via the depends system.

I didn't try before updating the command line tools in Xcode 9.3, but indeed building QT on macOS 10.13.4 is broken for me:

cd depends
make
...
compiling util/qundoview.cpp
rm -f ../../lib/libQt5Widgets.a
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar cq ../../lib/libQt5Widgets.a .obj/qaction.o .obj/qactiongroup.o .obj/qapplication.o
...
.obj/moc_qmacstyle_mac_p.o .obj/moc_qmacnativewidget_mac.o .obj/moc_qmaccocoaviewcontainer_mac.o
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../lib/libQt5Widgets.a(qstylepainter.o) has no symbols
...
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../lib/libQt5Widgets.a(qscroller_mac.o) has no symbols
make: *** [/Volumes/SSD/src/bitcoin/depends/work/build/x86_64-apple-darwin17.5.0/qt/5.7.1-78660355bf0/qtbase/.stamp_built] Error 2

This PR fixes it for me.

theuni
theuni approved these changes Apr 12, 2018
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.

utACK 5b4fc3e

@laanwj laanwj merged commit 5b4fc3e into bitcoin:master Apr 14, 2018
laanwj added a commit that referenced this pull request Apr 14, 2018
@laanwj
Merge #12946: depends: Fix Qt build with XCode 9.3
e76acf3 
5b4fc3e depends: Fix Qt build with XCode 9.3 (fanquake)

Pull request description:

  Building Qt with Xcode 9.3 is currently broken with:
  ```
  compiling kernel/qmacgesturerecognizer.cpp
  fontdatabases/mac/qfontengine_coretext.mm:775:20: error: qualified reference to 'QFixed' is a constructor name rather than a type in this context
      return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
                     ^
  compiling .moc/moc_qfbscreen_p.cpp
  1 error generated.
  make[2]: *** [.obj/qfontengine_coretext.o] Error 1
  make[2]: *** Waiting for unfinished jobs....

  ```
  This patch should fix that, and will hopefully be the last time we have to patch Qt 5.7.

  I've only made minor adjustments from the [original patch](https://codereview.qt-project.org/#/c/224900/), so that it will apply, although still not completely cleanly. We can cleanup if required.

Tree-SHA512: ad9e682081b9d2b0ccd4ea8e167ba15f1a903e39185a0cbfaa6608f1a45fcfb019e8726148fb301d65ddadaa23122825ccd6fdfc8de78767b653d5d1e47205da
@maflcko maflcko mentioned this pull request Apr 15, 2018
Merged
@fanquake fanquake mentioned this pull request Apr 18, 2018
Merged
@droark droark mentioned this pull request Apr 24, 2018
Closed
fanquake added a commit to fanquake/bitcoin that referenced this pull request Apr 26, 2018
@fanquake
depends: Fix Qt build with XCode 9.3
e055bc0 
GitHub-Pull: bitcoin#12946
Rebased-From: 5b4fc3e
fanquake added a commit to fanquake/bitcoin that referenced this pull request Apr 26, 2018
@fanquake
depends: Fix Qt build with XCode 9.3
93b9a61 
GitHub-Pull: bitcoin#12946
Rebased-From: 5b4fc3e
@fanquake fanquake mentioned this pull request Apr 26, 2018
Merged
laanwj added a commit that referenced this pull request May 15, 2018
@laanwj
Merge #13093: [0.15] backport: depends qt patches
1618c63 
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
laanwj added a commit that referenced this pull request May 16, 2018
@laanwj
Merge #12967: [0.16] Backports
feba12f 
8fca086 List support for BIP173 in bips.md (Pieter Wuille)
9645aa6 Remove blockmaxsize option from init.cpp (fanquake)
7847b92 Default to defining endian-conversion DECLs in compat w/o config (Matt Corallo)
1720eb3 qt:Show the entire Window when double clicking on taskbar (Chun Kuan Lee)
e055bc0 depends: Fix Qt build with XCode 9.3 (fanquake)
0684cf9 Avoid launching as admin when NSIS installer ends. (JeremyRand)
e802c22 [config] Remove blockmaxsize option (John Newbery)
f118a7a Fix illegal default `addProxy` and `addrSeparateProxyTor` settings. (251)
f60e84d Limit the number of IPs we use from each DNS seeder (e0)

Pull request description:

  Backports:
  - #12626 Limit the number of IPs addrman learns from each DNS seeder
  - #12650 gui: Fix issue: "default port not shown correctly in settings dialog"
  - #12756 [config] Remove blockmaxsize option
  - #12985 Windows: Avoid launching as admin when NSIS installer ends.
  - #12946 depends: Fix Qt build with XCode 9.3
  - #12998 Default to defining endian-conversion DECLs in compat w/o config
  - #12999 qt: Show the Window when double clicking the taskbar icon
  - #13064 List support for BIP173 in bips.md

  to the 0.16 branch.

Tree-SHA512: 3e6b47c54b2cd2bdd81fbc6176cb31e46423f6e05988984d3a09b3535e3cee101ffb071cf753a4beff3c9f0521eb5de4b7c0424a3e97da801d56b4015847ac0f
@sickpig sickpig mentioned this pull request Jun 5, 2018
Merged
XNotCopy pushed a commit to DigitalToaster/ReducedBitcoin that referenced this pull request Jun 21, 2018
@fanquake @XNotCopy
depends: Fix Qt build with XCode 9.3
4cbc53b 
GitHub-Pull: bitcoin#12946
Rebased-From: 5b4fc3e
HashUnlimited pushed a commit to chaincoin/chaincoin that referenced this pull request Jun 29, 2018
@fanquake
depends: Fix Qt build with XCode 9.3
5e608ba 
GitHub-Pull: bitcoin#12946
Rebased-From: 5b4fc3e
whatevercode added a commit to whatevercode/hempcoin that referenced this pull request Jul 14, 2018
@whatevercode
depends: Fix Qt build with XCode 9.3 bitcoin/bitcoin#12946
c574846
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Sep 25, 2018
@laanwj @UdjinM6
Merge bitcoin#13093: [0.15] backport: depends qt patches
b652a91 
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
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Sep 26, 2018
@fanquake @UdjinM6
depends: Fix Qt build with XCode 9.3
8d010c6 
GitHub-Pull: bitcoin#12946
Rebased-From: 5b4fc3e
codablock pushed a commit to codablock/dash that referenced this pull request Sep 28, 2018
@laanwj @codablock
Merge bitcoin#13093: [0.15] backport: depends qt patches
d817a38 
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
UdjinM6 added a commit to dashpay/dash that referenced this pull request Sep 30, 2018
@UdjinM6
Backport: Fix Qt build with XCode (for depends) (#2325)
8a1b513 
* [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
CryptoCentric pushed a commit to absolute-community/absolute that referenced this pull request Mar 13, 2019
@UdjinM6 @CryptoCentric
Backport: Fix Qt build with XCode (for depends) (dashpay#2325)
2b0670d 
* [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
@fanquake fanquake deleted the fix-qt-xcode93 branch January 22, 2020 11:29
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@theuni theuni theuni approved these changes

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

Successfully merging this pull request may close these issues.
5 participants
@fanquake @practicalswift @Sjors @theuni @laanwj
0