summaryrefslogtreecommitdiffstats
path: root/src/src.pro
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2016-03-29 10:02:17 +0200
committerLars Knoll <lars.knoll@theqtcompany.com>2016-04-15 20:11:03 +0000
commitdd22889ed63599d44baa3bcb0fff6f75f328ff50 (patch)
treecadf48b87611e203f3b4bf85f40078f6f0e5ed15 /src/src.pro
parenta4a83f52f9ee862d703c21dcd9915ebfd7c72ac5 (diff)
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 <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/src.pro')
-rw-r--r--src/src.pro4
1 files changed, 2 insertions, 2 deletions
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
}