diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-10 14:18:02 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-19 21:47:59 +0000 |
commit | 4dcfd90e4fd7d4c49138038dbbcbda8794a9fbff (patch) | |
tree | da7dce66a14e5591be0c0a5651cfcc110badc5cd /src/3rdparty | |
parent | 0796c62ad50740c71555c6db51c42f998b4258c1 (diff) |
fix parallel builds with -qt-freetype -system-libpng
freetype has no dependency on gui, so it needs to pull in gui's
configuration manually, as that's where the system libpng is found.
Task-number: QTBUG-58038
Change-Id: I881495f7d2a8f7c1a45d7d4c9e7698ff1d30f2a9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Joni Poikelin <joni.poikelin@qt.io>
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/freetype/freetype.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/freetype/freetype.pro b/src/3rdparty/freetype/freetype.pro index 5b1eb92e32..390a6da749 100644 --- a/src/3rdparty/freetype/freetype.pro +++ b/src/3rdparty/freetype/freetype.pro @@ -69,6 +69,7 @@ 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 DEFINES += TT_CONFIG_OPTION_SUBPIXEL_HINTING |