diff options
| author | Tim Blechmann <tim@klingt.org> | 2017-05-10 12:56:51 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-12-07 23:48:21 +0000 |
| commit | fc2c4edcbda8be88900201383b5113e234b09d71 (patch) | |
| tree | 6b9141d9c788e05f73afd35ff7ffbef098e58285 /src | |
| parent | 33276e1cf14095c681ef87f1b44809b5ee1e771f (diff) | |
configure: fix linking with statically linked freetype
freetype depends on zlib. using statically linked freetype as system
library lacks the usage requirement to link with zlib. so we need to
add this manually.
Task-number: QTBUG-63115
Change-Id: Iaf0f3027bd9d1386fcc1ecfbfbe07ab09b2d0bb9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/configure.json | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 6a2f1fe434..0d4f167d47 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -164,6 +164,9 @@ { "type": "pkgConfig", "args": "freetype2" }, { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" }, { "type": "freetype", "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" } + ], + "use": [ + { "lib": "zlib", "condition": "features.system-zlib" } ] }, "fontconfig": { |