From dd22889ed63599d44baa3bcb0fff6f75f328ff50 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 29 Mar 2016 10:02:17 +0200 Subject: Change the way we handle features that have sub-features Make sure we always set the base feature as a flag in qtconfig, and set the sub-feature in addition if it's being used. Change-Id: Icfeb0ec1ac9e1a615b5b22eb5fcce47e0e7fc153 Reviewed-by: Oswald Buddenhagen --- src/src.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/src.pro') diff --git a/src/src.pro b/src/src.pro index 88add4e807..0e411f96af 100644 --- a/src/src.pro +++ b/src/src.pro @@ -149,7 +149,7 @@ contains(QT_CONFIG, dbus) { } contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent !contains(QT_CONFIG, no-gui) { - contains(QT_CONFIG, harfbuzz) { + contains(QT_CONFIG, harfbuzz):!contains(QT_CONFIG, system-harfbuzz) { SUBDIRS += src_3rdparty_harfbuzzng src_gui.depends += src_3rdparty_harfbuzzng } @@ -157,7 +157,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent SUBDIRS += src_angle src_gui.depends += src_angle } - contains(QT_CONFIG, freetype) { + contains(QT_CONFIG, freetype):!contains(QT_CONFIG, system-freetype) { SUBDIRS += src_3rdparty_freetype src_platformsupport.depends += src_3rdparty_freetype } -- cgit v1.2.3