From bb2a0bbd71019c44a38ba8608f8a7b3cd2106f7e Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Fri, 12 Jul 2019 11:17:40 +0200 Subject: Fix detection of ozone x11 support Fixes: QTBUG-77011 Change-Id: I0136b360c74970b912124f6f308f598c80eceba3 Reviewed-by: Allan Sandfeld Jensen --- src/core/configure.json | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'src/core/configure.json') diff --git a/src/core/configure.json b/src/core/configure.json index 6dccd1644..9e4eb62ac 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -642,6 +642,17 @@ "condition": "config.unix && libs.webengine-x11", "output": [ "privateFeature" ] }, + "webengine-ozone-x11" : { + "label": "Support qpa-xcb", + "condition": "config.unix + && features.webengine-system-x11 + && features.webengine-system-libdrm + && features.webengine-system-xcomposite + && features.webengine-system-xcursor + && features.webengine-system-xi + && features.webengine-system-xtst", + "output": [ "privateFeature" ] + }, "webengine-sanitizer" : { "label": "Sanitizer", "autoDetect": "config.sanitizer && tests.webengine-sanitizer", @@ -730,6 +741,11 @@ "webengine-webchannel", "webengine-v8-snapshot", "webengine-kerberos", + { + "type": "feature", + "args": "webengine-ozone-x11", + "condition": "config.unix" + }, { "type": "feature", "args": "webengine-v8-snapshot-support", @@ -802,8 +818,7 @@ "webengine-system-png", "webengine-system-jpeg", "webengine-system-harfbuzz", - "webengine-system-freetype", - "webengine-system-x11" + "webengine-system-freetype" ] }, { @@ -821,6 +836,7 @@ "section": "Required system libraries for qpa-xcb", "condition": "config.unix && !config.macos", "entries": [ + "webengine-system-x11", "webengine-system-libdrm", "webengine-system-xcomposite", "webengine-system-xcursor", -- cgit v1.2.3