diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-01-16 11:21:41 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-01-17 13:55:19 +0000 |
commit | 3f7ea91e23d82e676aeaf157736e25cf54e5ec6b (patch) | |
tree | 3377415f8b33c18b7039a4c1dac0108fd288a5b0 /mkspecs | |
parent | 2fa1cd31a061547df3b374502d8f7574773987b6 (diff) |
Fix build when we don't have all the X11 dependencies
We only enable the GLX backends when we have all the X11 dependencies,
but try to build the corresponding sources files even when we don't.
And additional xrandr is no longer a dependency.
Change-Id: I35c97c34c6d121bd6544344a73653900bf406be3
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/configure.prf | 2 | ||||
-rw-r--r-- | mkspecs/features/functions.prf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index 0721bdd2c..d7d382a4f 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -91,7 +91,7 @@ defineTest(runConfigure) { } !qtConfig(webengine-embedded-build): qtConfig(xcb) { - for(package, $$list("libdrm xcomposite xcursor xi xrandr xtst")) { + for(package, $$list("libdrm xcomposite xcursor xi xtst")) { !qtConfig(webengine-system-$$package) { skipBuild("A suitable version of $$package could not be found.") return(false) diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index f433de3b2..f6aeea21a 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -131,7 +131,7 @@ defineReplace(pkgConfigHostExecutable) { } defineTest(hasX11Dependencies) { - for(package, $$list("libdrm xcomposite xcursor xi xrandr xtst")) { + for(package, $$list("libdrm xcomposite xcursor xi xtst")) { !qtConfig(webengine-system-$$package) { return(false) } |