diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-04-14 20:19:37 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-04-14 20:20:04 +0200 |
| commit | e76acf3384aca13cd2dd850568317c0ce44458ed (patch) | |
| tree | 0e116d6c7a85a0e74efc06abbdf98cba013cb016 /src/net.cpp | |
| parent | dec61152d6cc711d627d5dee497156d4a19c2499 (diff) | |
| parent | 5b4fc3eca429456628a5db4e4090da294eb1eba1 (diff) | |
Merge #12946: depends: Fix Qt build with XCode 9.3
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
Diffstat (limited to 'src/net.cpp')
0 files changed, 0 insertions, 0 deletions