diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-17 12:35:16 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-17 12:35:29 +0100 |
| commit | 393fc2d4f5e0cbc6d6b3bd0e3c1624d5f9a15ee5 (patch) | |
| tree | 85588778b5cf605bf9f15a48495eea24ef401a92 /src/platformsupport | |
| parent | 50e2bc2aa0f46562936a3137c15a2c9b4f67afde (diff) | |
| parent | b63c721a0e8d637dd2a34cc5d335195349443366 (diff) | |
Merge remote-tracking branch 'origin/dev' into 5.5
Needed due to license header patch.
Change-Id: Id7e30490132a7c487687a0a376419e9f9b97ea41
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm index 3485c9a558..123a2c4c79 100644 --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm @@ -39,9 +39,11 @@ #include <private/qimage_p.h> +#include <cmath> + QT_BEGIN_NAMESPACE -static float SYNTHETIC_ITALIC_SKEW = tanf(14 * acosf(0) / 90); +static float SYNTHETIC_ITALIC_SKEW = std::tan(14.f * std::acos(0.f) / 90.f); bool QCoreTextFontEngine::ct_getSfntTable(void *user_data, uint tag, uchar *buffer, uint *length) { |