From f1aa4c076fd10ededea3e87b7f53da2c0be84906 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 10 Jan 2019 07:57:21 +0100 Subject: Fix build with -no-libpng on Windows Check for availability of libpng in our bundled libfreetype. Fixes: QTBUG-71395 Change-Id: I99664b8583011f517b18e1038e327c6cb6799af7 Reviewed-by: Oliver Wolff --- src/3rdparty/freetype/freetype.pro | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/3rdparty/freetype') diff --git a/src/3rdparty/freetype/freetype.pro b/src/3rdparty/freetype/freetype.pro index 47ac9122ae..4034815158 100644 --- a/src/3rdparty/freetype/freetype.pro +++ b/src/3rdparty/freetype/freetype.pro @@ -69,8 +69,11 @@ DEFINES += FT2_BUILD_LIBRARY DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB include(../zlib_dependency.pri) -DEFINES += FT_CONFIG_OPTION_USE_PNG include($$OUT_PWD/../../gui/qtgui-config.pri) -QMAKE_USE_PRIVATE += libpng +QT_FOR_CONFIG += gui-private +qtConfig(png) { + DEFINES += FT_CONFIG_OPTION_USE_PNG + QMAKE_USE_PRIVATE += libpng +} DEFINES += TT_CONFIG_OPTION_SUBPIXEL_HINTING -- cgit v1.2.3