summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/freetype.pri2
-rw-r--r--src/3rdparty/freetype/src/gzip/zutil.h2
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));