diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-05-19 17:48:22 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-05-19 17:48:22 +0200 |
| commit | 85e7fa7f9a002e7c0708af7a99d165a23753ecf4 (patch) | |
| tree | c6c1ab0973a595e26f3f29f9b88a5602ed1138d9 /src/buildtools | |
| parent | b2e11595e167fd51095720af286eb21447f80d20 (diff) | |
| parent | 8f7e7cfb75f821c802ed4189530f675608507ba8 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/core/render_widget_host_view_qt.cpp
Change-Id: I86113b13bb2d8419e9e9a485197f02b2c7399cd4
Diffstat (limited to 'src/buildtools')
| -rw-r--r-- | src/buildtools/configure.json | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index 0ea575c35..ba42c2c3f 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -56,6 +56,12 @@ { "type": "pkgConfig", "args": "xtst" } ] }, + "webengine-xkbfile": { + "label": "xkbfile", + "sources": [ + { "type": "pkgConfig", "args": "xkbfile" } + ] + }, "webengine-nss": { "label": "nss >= 3.26", "sources": [ @@ -493,6 +499,11 @@ "condition": "libs.webengine-xtst", "output": [ "privateFeature" ] }, + "webengine-system-xkbfile": { + "label": "xkbfile", + "condition": "libs.webengine-xkbfile", + "output": [ "privateFeature" ] + }, "webengine-system-gn": { "label": "Use System Gn", "autoDetect": "false", @@ -541,7 +552,8 @@ && features.webengine-system-xcursor && features.webengine-system-xi && features.webengine-system-xproto-gl - && features.webengine-system-xtst", + && features.webengine-system-xtst + && features.webengine-system-xkbfile", "output": [ "privateFeature" ] }, "webengine-jumbo-build": { @@ -787,7 +799,8 @@ "webengine-system-xcursor", "webengine-system-xi", "webengine-system-xproto-gl", - "webengine-system-xtst" + "webengine-system-xtst", + "webengine-system-xkbfile" ] }, { |