diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-03-15 02:00:55 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-03-20 13:42:38 +0000 |
| commit | 7ff3a7d3a3b5370cc2318022496d2d285ed2b3f6 (patch) | |
| tree | 288c658bd38b6366c0e4acd732cbcf545d97fb29 /src | |
| parent | 2eaf0cf8fd6e7c290497fedb08134a89e7b49b1d (diff) | |
Apply Qt-specific changes to the bundled FreeType
Enable TT_CONFIG_OPTION_SUBPIXEL_HINTING instead of deprecated
TT_CONFIG_OPTION_UNPATENTED_HINTING to improve hinted rendering.
Change-Id: I63efae235a2abb1a9f4bbba5fec900670e1ffe9a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/freetype.pri | 2 | ||||
| -rw-r--r-- | src/3rdparty/freetype/src/gzip/zutil.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty/freetype.pri b/src/3rdparty/freetype.pri index 33981c6e3c..02b6295228 100644 --- a/src/3rdparty/freetype.pri +++ b/src/3rdparty/freetype.pri @@ -61,6 +61,8 @@ contains(QT_CONFIG, system-zlib) { include($$PWD/zlib_dependency.pri) } +DEFINES += TT_CONFIG_OPTION_SUBPIXEL_HINTING + # disable warnings about "unsafe" methods in C code msvc:QMAKE_CFLAGS_WARN_ON += -wd"4996" diff --git a/src/3rdparty/freetype/src/gzip/zutil.h b/src/3rdparty/freetype/src/gzip/zutil.h index c9688cd9c0..1949270998 100644 --- a/src/3rdparty/freetype/src/gzip/zutil.h +++ b/src/3rdparty/freetype/src/gzip/zutil.h @@ -182,7 +182,7 @@ typedef unsigned long ulg; #endif /* Diagnostic functions */ -#ifdef DEBUG +#if defined(DEBUG) && !defined(_WIN32_WCE) # include <stdio.h> extern int z_verbose; extern void z_error OF((char *m)); |