From 2e304751b3b2b142cb24a48fcc76a21faa5be812 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Thu, 5 May 2016 02:10:24 -0700
Subject: [PATCH] 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>
---
.../fontdatabases/mac/qfontengine_coretext.mm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
index bcb57368f5c..91bf00d1a74 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;
}
--
GitLab