diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-09-18 12:54:09 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2018-10-23 09:45:04 +0000 |
| commit | 90f52fd2e5b15fde227231d4c1fc47490ce364d6 (patch) | |
| tree | 41848170da1235794a5d3178b9ffa415b371bc79 | |
| parent | bd178893f27a3068bc7d63fe2fb9a60aa6a20bb3 (diff) | |
| download | qtwebengine-90f52fd2e5b15fde227231d4c1fc47490ce364d6.tar.gz | |
Add extra config check for x11 ozone plugin
In case of cross compilation for targets with x11,
check also for dependencies.
Change-Id: I32df962a61e5a13ee1290ab2c256f0f222dafbd3
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | mkspecs/features/functions.prf | 9 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index a26f1258d..c9bd65b03 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -127,3 +127,12 @@ defineReplace(pkgConfigHostExecutable) { export(QMAKE_DISTCLEAN) return($$system_quote($$system_path($$wrapper_name))) } + +defineTest(hasX11Dependencies) { + for(package, $$list("libdrm xcomposite xcursor xi xrandr xtst")) { + !qtConfig(webengine-system-$$package) { + return(false) + } + } + return(true) +} diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 7f634472d..eb8bb7bb0 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -24,7 +24,7 @@ qtConfig(webengine-embedded-build) { !use_gold_linker: gn_args += use_gold=false } -qtConfig(webengine-system-x11) { +qtConfig(webengine-system-x11): hasX11Dependencies() { gn_args += ozone_platform_x11=true } |