diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-31 13:10:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-31 14:31:31 +0200 |
| commit | 112a4af10741409b3d8503cb77852a777b607ce0 (patch) | |
| tree | fa99f0f37fc1505522fe9368e95484c7732ccda8 /src/platformsupport | |
| parent | 29ef0d2bccd1874e20de94485ee05777c3a95c5d (diff) | |
| parent | e938150412d22e61926fe16791158805b71268bb (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
examples/examples.pro
qmake/library/qmakebuiltins.cpp
src/corelib/global/qglobal.cpp
Re-apply b525ec2 to qrandom.cpp(code movement in 030782e)
src/corelib/global/qnamespace.qdoc
src/corelib/global/qrandom.cpp
src/gui/kernel/qwindow.cpp
Re-apply a3d59c7 to QWindowPrivate::setVisible() (code movement in d7a9e08)
src/network/ssl/qsslkey_openssl.cpp
src/plugins/platforms/android/androidjniinput.cpp
src/plugins/platforms/xcb/qxcbconnection.cpp
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/widgets/widgets/qmenu.cpp
tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
Change-Id: If7ab427804408877a93cbe02079fca58e568bfd3
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/fbconvenience/qfbvthandler.cpp | 1 | ||||
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | 45 | ||||
| -rw-r--r-- | src/platformsupport/fontdatabases/winrt/winrt.pri | 2 |
3 files changed, 27 insertions, 21 deletions
diff --git a/src/platformsupport/fbconvenience/qfbvthandler.cpp b/src/platformsupport/fbconvenience/qfbvthandler.cpp index 102bc91647..7bb9e28ac2 100644 --- a/src/platformsupport/fbconvenience/qfbvthandler.cpp +++ b/src/platformsupport/fbconvenience/qfbvthandler.cpp @@ -50,7 +50,6 @@ #include <signal.h> #include <errno.h> #include <fcntl.h> -#include <sys/signalfd.h> #include <sys/ioctl.h> #include <linux/kd.h> diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm index 49a6049c4b..66baf162d9 100644 --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm @@ -112,25 +112,32 @@ bool QCoreTextFontEngine::ct_getSfntTable(void *user_data, uint tag, uchar *buff QFont::Weight QCoreTextFontEngine::qtWeightFromCFWeight(float value) { - if (value >= kCTFontWeightBlack) - return QFont::Black; - if (value >= kCTFontWeightHeavy) - return QFont::ExtraBold; - if (value >= kCTFontWeightBold) - return QFont::Bold; - if (value >= kCTFontWeightSemibold) - return QFont::DemiBold; - if (value >= kCTFontWeightMedium) - return QFont::Medium; - if (value == kCTFontWeightRegular) - return QFont::Normal; - if (value <= kCTFontWeightUltraLight) - return QFont::Thin; - if (value <= kCTFontWeightThin) - return QFont::ExtraLight; - if (value <= kCTFontWeightLight) - return QFont::Light; - return QFont::Normal; +#define COMPARE_WEIGHT_DISTANCE(ct_weight, qt_weight) \ + { \ + float d; \ + if ((d = qAbs(value - ct_weight)) < distance) { \ + distance = d; \ + ret = qt_weight; \ + } \ + } + + float distance = qAbs(value - kCTFontWeightBlack); + QFont::Weight ret = QFont::Black; + + // Compare distance to system weight to find the closest match. + // (Note: Must go from high to low, so that midpoints are rounded up) + COMPARE_WEIGHT_DISTANCE(kCTFontWeightHeavy, QFont::ExtraBold); + COMPARE_WEIGHT_DISTANCE(kCTFontWeightBold, QFont::Bold); + COMPARE_WEIGHT_DISTANCE(kCTFontWeightSemibold, QFont::DemiBold); + COMPARE_WEIGHT_DISTANCE(kCTFontWeightMedium, QFont::Medium); + COMPARE_WEIGHT_DISTANCE(kCTFontWeightRegular, QFont::Normal); + COMPARE_WEIGHT_DISTANCE(kCTFontWeightLight, QFont::Light); + COMPARE_WEIGHT_DISTANCE(kCTFontWeightThin, QFont::ExtraLight); + COMPARE_WEIGHT_DISTANCE(kCTFontWeightUltraLight, QFont::Thin); + +#undef COMPARE_WEIGHT_DISTANCE + + return ret; } static void loadAdvancesForGlyphs(CTFontRef ctfont, diff --git a/src/platformsupport/fontdatabases/winrt/winrt.pri b/src/platformsupport/fontdatabases/winrt/winrt.pri index 4875338182..291ada220f 100644 --- a/src/platformsupport/fontdatabases/winrt/winrt.pri +++ b/src/platformsupport/fontdatabases/winrt/winrt.pri @@ -8,4 +8,4 @@ HEADERS += \ DEFINES += __WRL_NO_DEFAULT_LIB__ -LIBS += $$QMAKE_LIBS_CORE -ldwrite +LIBS += -lws2_32 -ldwrite |