summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2020-05-20 18:01:13 +0200
committerMichal Klocek <michal.klocek@qt.io>2020-05-28 18:53:38 +0200
commit59d12e0bbd0e620fc60d719acfbb45dfb8495e23 (patch)
treeafc8605d4564117949d26cbf9b79481fe19d504e /src/core
parenta879bf0c37c9e7aa1fc3449bd8dfcf514f53118b (diff)
Remove duplicated feature webengine-ozone-x11
This feature is already in buildtools. Change-Id: Iff5d5cc4b72b29b850e8e4cb11b90251916ed9c7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core')
-rw-r--r--src/core/configure.json12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/core/configure.json b/src/core/configure.json
index 55e68ab04..167555d79 100644
--- a/src/core/configure.json
+++ b/src/core/configure.json
@@ -187,15 +187,9 @@
"autoDetect": "!features.webengine-embedded-build",
"output": [ "privateFeature" ]
},
- "webengine-ozone-x11" : {
+ "webengine-ozone" : {
"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",
+ "condition": "features.webengine-ozone-x11",
"output": [ "privateFeature" ]
},
"webengine-sanitizer" : {
@@ -274,7 +268,7 @@
"webengine-extensions",
{
"type": "feature",
- "args": "webengine-ozone-x11",
+ "args": "webengine-ozone",
"condition": "config.unix"
},
{