diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-05-14 10:49:00 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-05-15 17:26:19 +0200 |
| commit | bc6df3888128e3a0e0d4e2f8a69970ac36d8abe7 (patch) | |
| tree | 2cb49ad5fffa0f2011b3d98faa363f105135901e /src/buildtools | |
| parent | 10e66c6dd0b8a8dd17252d6408c13b689fac6995 (diff) | |
| parent | 585da6f74012bd09e8a873080e368cff99c97cbf (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/pdf/quick/qquickpdfselection_p.h
Change-Id: I6eec37a01347c2d47cbfc1114326dfc6b58719ff
Diffstat (limited to 'src/buildtools')
| -rw-r--r-- | src/buildtools/config/linux.pri | 6 | ||||
| -rw-r--r-- | src/buildtools/configure.json | 21 |
2 files changed, 2 insertions, 25 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 27bd3ebf8..f02ab8070 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -32,12 +32,6 @@ { "type": "pkgConfig", "args": "libdrm" } ] }, - "webengine-xkbcommon": { - "label": "xkbcommon", - "sources": [ - { "type": "pkgConfig", "args": "xkbcommon" } - ] - }, "webengine-xcomposite": { "label": "xcomposite", "sources": [ @@ -296,13 +290,6 @@ ] } }, - "webengine-xkbcommon": { - "label": "system xkbcommon", - "type": "compile", - "test": { - "include": "xkbcommon/xkbcommon.h" - } - }, "webengine-ninja": { "label": "system ninja", "type": "detectNinja", @@ -457,11 +444,6 @@ "condition": "libs.webengine-libdrm", "output": [ "privateFeature" ] }, - "webengine-system-xkbcommon": { - "label": "xkbcommon", - "condition": "libs.webengine-xkbcommon && tests.webengine-xkbcommon", - "output": [ "privateFeature" ] - }, "webengine-system-xcomposite": { "label": "xcomposite", "condition": "libs.webengine-xcomposite", @@ -756,8 +738,7 @@ "webengine-system-png", "webengine-system-jpeg", "webengine-system-harfbuzz", - "webengine-system-freetype", - "webengine-system-xkbcommon" + "webengine-system-freetype" ] } ] |