diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-05-11 14:35:40 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-05-13 09:33:18 +0200 |
| commit | 585da6f74012bd09e8a873080e368cff99c97cbf (patch) | |
| tree | 1b5a871913f4afdfbb407bb70be2ba0d121b9b67 /src/buildtools | |
| parent | c7352983348d666ed1a72cdda7ee48467898fbfa (diff) | |
Remove xkbcommon hack
We fixed Chromium to compile with the right include paths, and the
system package is already required by QtGui.
Fixes: QTBUG-83693
Change-Id: I8256e67cf0fca3aa71df6d6bad1b13436c689b8a
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/buildtools')
| -rw-r--r-- | src/buildtools/config/linux.pri | 6 | ||||
| -rw-r--r-- | src/buildtools/configure.json | 15 |
2 files changed, 2 insertions, 19 deletions
diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri index c02af3909..455a2e3c6 100644 --- a/src/buildtools/config/linux.pri +++ b/src/buildtools/config/linux.pri @@ -192,15 +192,11 @@ host_build { } else { gn_args += use_alsa=false } - qtConfig(build-qtwebengine-core):qtConfig(webengine-system-xkbcommon) { - gn_args += use_xkbcommon=true - } else { - gn_args += use_xkbcommon=false - } !packagesExist(libpci): gn_args += use_libpci=false qtConfig(build-qtwebengine-core):qtConfig(webengine-ozone-x11) { gn_args += ozone_platform_x11=true + gn_args += use_xkbcommon=true packagesExist(xscrnsaver): gn_args += use_xscrnsaver=true qtConfig(webengine-webrtc): gn_args += rtc_use_x11=true } diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index a80ef32eb..ec0ca5c5d 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -32,13 +32,6 @@ { "type": "pkgConfig", "args": "libdrm" } ] }, - "webengine-xkbcommon": { - "label": "xkbcommon", - "headers": "xkbcommon/xkbcommon.h", - "sources": [ - "-lxkbcommon" - ] - }, "webengine-xcomposite": { "label": "xcomposite", "sources": [ @@ -447,11 +440,6 @@ "condition": "libs.webengine-libdrm", "output": [ "privateFeature" ] }, - "webengine-system-xkbcommon": { - "label": "xkbcommon", - "condition": "libs.webengine-xkbcommon", - "output": [ "privateFeature" ] - }, "webengine-system-xcomposite": { "label": "xcomposite", "condition": "libs.webengine-xcomposite", @@ -746,8 +734,7 @@ "webengine-system-png", "webengine-system-jpeg", "webengine-system-harfbuzz", - "webengine-system-freetype", - "webengine-system-xkbcommon" + "webengine-system-freetype" ] } ] |