aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-11-06 11:14:04 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2017-11-06 11:10:49 +0000
commitde385cb2159007d5e663ecfe808b6023812805e8 (patch)
tree85fe99bc73d76f7f79c2025ce8bdc6c8c9bc4ef5
parent66597a40fa56b9b850414ea6d059df133685e620 (diff)
sdk: add missing wayland tools to native sdk
The DISTRO_FEATURES are now filtered for native and nativesdk. Since we are using it to determine if (qt)wayland tools should be installed into the sdk, we need to make sure that wayland is still applied to those builds when enabled. Task-number: QTBUG-64286 Change-Id: I693a2fad7aeee26479ee10654cd4f55f34c8711b Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r--conf/distro/b2qt.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 3048fff7..08efdf1c 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -54,6 +54,8 @@ SYSVINIT_ENABLED_GETTYS = ""
DISTRO_FEATURES_DEFAULT_remove = "irda pcmcia pci 3g nfc zeroconf x11"
DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio sysvinit"
+DISTRO_FEATURES_FILTER_NATIVESDK_append = " wayland"
+
FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache"
# use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10