diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-01-10 07:57:21 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2019-01-11 07:58:29 +0000 |
| commit | f1aa4c076fd10ededea3e87b7f53da2c0be84906 (patch) | |
| tree | 933482177762ba8e99fd9cdca1e348e38c9c9dfb /src/3rdparty | |
| parent | 74c8aa76089ce0b16ddd4d560530cf6df85d397e (diff) | |
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 <oliver.wolff@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/freetype/freetype.pro | 7 |
1 files changed, 5 insertions, 2 deletions
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 |