From 89bc0ad2d10f2c866a111965cd3805b70a9fd728 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Tue, 19 Sep 2017 16:12:51 +0200 Subject: Fix system-harfbuzz and system-png detection Import gui-private to check for system-png and system-harfbuzz. Change-Id: I26fe98ce3de1f6af8015228260e8ef74952e816e Reviewed-by: Allan Sandfeld Jensen --- src/core/config/linux.pri | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/core') diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index fae157060..a2361b02f 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -116,15 +116,10 @@ host_build { } qtConfig(system-zlib): qtConfig(system-minizip): gn_args += use_system_zlib=true use_system_minizip=true - - # FIXME: make system-png a public feature in gui - qtConfig(system-png): qtConfig(webengine-system-png): gn_args += use_system_libpng=true - + qtConfig(webengine-system-png): gn_args += use_system_libpng=true qtConfig(system-jpeg): gn_args += use_system_libjpeg=true qtConfig(system-freetype): gn_args += use_system_freetype=true - - # FIXME: make system-harfbuzz a public feautre in gui - qtConfig(system-harfbuzz): qtConfig(webengine-system-harfbuzz): gn_args += use_system_harfbuzz=true + qtConfig(webengine-system-harfbuzz): gn_args += use_system_harfbuzz=true qtConfig(system-glib): gn_args += use_glib=false qtConfig(pulseaudio) { gn_args += use_pulseaudio=true -- cgit v1.2.3