diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:58:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:58:32 +0200 |
| commit | 17198e03ab36e5f579a1477b09cc3e601975eb5f (patch) | |
| tree | 61ba826e9edd53469abdc1e1f58b1223d0336c56 /src/gui/text/qrawfont.cpp | |
| parent | a5e89005445ac8ca18ac046eaf55fe2230e47cd6 (diff) | |
| parent | 2e2b32a9ab459f6618d02e4b454c75a787172def (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
qmake/doc/src/qmake-manual.qdoc
src/corelib/global/qglobal.cpp
src/corelib/tools/qstring.cpp
src/network/socket/qabstractsocket.cpp
src/network/socket/qnativesocketengine_unix.cpp
src/plugins/platforms/eglfs/api/qeglfsglobal.h
Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288
Diffstat (limited to 'src/gui/text/qrawfont.cpp')
| -rw-r--r-- | src/gui/text/qrawfont.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qrawfont.cpp b/src/gui/text/qrawfont.cpp index 19ac4f1dbc..eadb65959a 100644 --- a/src/gui/text/qrawfont.cpp +++ b/src/gui/text/qrawfont.cpp @@ -86,7 +86,7 @@ QT_BEGIN_NAMESPACE also have accessors to some relevant data in the physical font. QRawFont only provides support for the main font technologies: GDI and DirectWrite on Windows - platforms, FreeType on Linux platforms and CoreText on OS X. For other + platforms, FreeType on Linux platforms and CoreText on \macos. For other font back-ends, the APIs will be disabled. QRawFont can be constructed in a number of ways: |