1 From 74af93f5298b54bc2327843f390bf202776f2f48 Mon Sep 17 00:00:00 2001
2 From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
3 Date: Tue, 10 Jan 2017 14:18:02 +0100
4 Subject: [PATCH] fix parallel builds with -qt-freetype -system-libpng
6 freetype has no dependency on gui, so it needs to pull in gui's
7 configuration manually, as that's where the system libpng is found.
9 Task-number: QTBUG-58038
10 Change-Id: I881495f7d2a8f7c1a45d7d4c9e7698ff1d30f2a9
11 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
12 Reviewed-by: Joni Poikelin <joni.poikelin@qt.io>
14 Upstream: https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4dcfd90e4fd7d4c49138038dbbcbda8794a9fbff
15 Signed-off-by: Peter Seiderer <ps.report@gmx.net>
17 src/3rdparty/freetype/freetype.pro | 1 +
18 1 file changed, 1 insertion(+)
20 diff --git a/src/3rdparty/freetype/freetype.pro b/src/3rdparty/freetype/freetype.pro
21 index 5b1eb92e..390a6da7 100644
22 --- a/src/3rdparty/freetype/freetype.pro
23 +++ b/src/3rdparty/freetype/freetype.pro
24 @@ -69,6 +69,7 @@ DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB
25 include(../zlib_dependency.pri)
27 DEFINES += FT_CONFIG_OPTION_USE_PNG
28 +include($$OUT_PWD/../../gui/qtgui-config.pri)
29 QMAKE_USE_PRIVATE += libpng
31 DEFINES += TT_CONFIG_OPTION_SUBPIXEL_HINTING