diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-05-05 02:10:24 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-05-05 14:21:57 +0000 |
| commit | 2e304751b3b2b142cb24a48fcc76a21faa5be812 (patch) | |
| tree | e5e789e9eed061662b6c9bdf4f7ee1f974671418 | |
| parent | 7c1326a1c390bb15eaa164f748c947f1df9f542d (diff) | |
Reorder negative font weight checks in qtWeightFromCFWeight.
This fixes a problem that caused the QFont::Thin and QFont::ExtraLight
conditions to be unreachable.
Change-Id: I62a701c53222edffbddbf868311111374ae5bea8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm index bcb57368f5..91bf00d1a7 100644 --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm @@ -75,12 +75,12 @@ QFont::Weight QCoreTextFontEngine::qtWeightFromCFWeight(float value) return QFont::Medium; if (value == 0.0) return QFont::Normal; - if (value <= -0.4) - return QFont::Light; - if (value <= -0.6) - return QFont::ExtraLight; if (value <= -0.8) return QFont::Thin; + if (value <= -0.6) + return QFont::ExtraLight; + if (value <= -0.4) + return QFont::Light; return QFont::Normal; } |