diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2021-04-29 14:17:23 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2021-05-12 15:11:56 +0200 |
| commit | 33e08cdfdfcb6ed759d5ba529db7e7b31484ee16 (patch) | |
| tree | 7cbf66909b8fe5e66213b0084fa46dec47833c31 /src/buildtools | |
| parent | e7d56d6c0a942a89bd9d497b57cbb0f70e39bb27 (diff) | |
Add support for Keyboard.getLayoutMap()
Pulls in the following changes:
Submodule src/3rdparty 6c7b4ffb..1d3b13e9
> 1d3b13e9634 Make clang to inline load/store atomic calls for YieldSortKey struct
> f6730fe81a0 Enable XkbKeyboardLayoutEngine::SetCurrentLayoutByName for Qt
Fixes: QTBUG-92971
Change-Id: I0c0cddfe4d3e25fd6d3f7e0764b302c300303172
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
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 812a91f9c..88d1790c1 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": [ @@ -490,6 +496,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", @@ -538,7 +549,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": { @@ -784,7 +796,8 @@ "webengine-system-xcursor", "webengine-system-xi", "webengine-system-xproto-gl", - "webengine-system-xtst" + "webengine-system-xtst", + "webengine-system-xkbfile" ] }, { |