diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-01-11 13:58:16 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-01-15 00:17:48 +0100 |
| commit | 763db8ce9ef7e7ac65b3b1a6b3358d75ee0a04a8 (patch) | |
| tree | 1a7ec499906a963d1c87804724d5aec530fa9050 /src | |
| parent | 5018a477c314184f75bff24713deb47d8aef15cb (diff) | |
Avoid using xkbcommon in non-X11 builds
Chromium defaults to using it now
Change-Id: I24f711ad0a7811b6ab644cef78a1ae0fac7b3d42
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/config/linux.pri | 2 | ||||
| -rw-r--r-- | src/pdf/config/common.pri | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 3e490a0d5..33dd28b42 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -27,6 +27,8 @@ qtConfig(webengine-embedded-build) { gn_args += use_xkbcommon=true packagesExist(xscrnsaver): gn_args += use_xscrnsaver=true qtConfig(webengine-webrtc): gn_args += rtc_use_x11=true + } else { + gn_args += use_xkbcommon=false } qtConfig(webengine-webrtc): qtConfig(webengine-webrtc-pipewire): gn_args += rtc_use_pipewire=true diff --git a/src/pdf/config/common.pri b/src/pdf/config/common.pri index c97d8036a..ec65b7bff 100644 --- a/src/pdf/config/common.pri +++ b/src/pdf/config/common.pri @@ -41,6 +41,10 @@ qtConfig(webengine-qt-zlib) { gn_args += "qt_zlib=\"$$system_path($$[QT_INSTALL_LIBS]/$$qtzlib)\"" } +linux:!qtConfig(webengine-ozone-x11) { + gn_args += use_xkbcommon=false +} + qtConfig(pdf-v8) { gn_args += pdf_enable_v8=true } else { |