diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2019-02-01 13:33:25 +0100 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2019-02-01 13:33:26 +0100 |
| commit | 2bc362c9fa37455afbeb56e5f1852188ede3eab4 (patch) | |
| tree | b89e3c2c082a0285e8cd91733ddbc772fe4362a5 /src/3rdparty/freetype/freetype.pro | |
| parent | 5de981d3bc3df874f9df35a6899345f4f61fa951 (diff) | |
| parent | 481db443d502c8ebc169b7256cb696428cf02199 (diff) | |
Merge dev into 5.13
Change-Id: I8113c6d8735a151bd152e6096f8c8b8e63a05474
Diffstat (limited to 'src/3rdparty/freetype/freetype.pro')
| -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 |