diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-19 12:08:56 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-23 14:06:37 +0200 |
commit | b73e4ce6f7cfe35a85b9a41e1a5ab36783e5edb0 (patch) | |
tree | 24d8c74f02562bc4d7815f3cb5c95d17e96f1550 /mkspecs | |
parent | b4a661eaa3506bd2a698e61e8228de029bd810ca (diff) | |
parent | c18c51acf8d0eb9426ce998d6e09f20a4a481c40 (diff) |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/configure.prf | 10 | ||||
-rw-r--r-- | mkspecs/features/functions.prf | 8 |
2 files changed, 3 insertions, 15 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index b8d9d43ce..cc84182b7 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -94,13 +94,9 @@ defineTest(runConfigure) { } } - !qtConfig(webengine-embedded-build): qtConfig(xcb) { - for(package, $$list("libdrm xcomposite xcursor xi xtst")) { - !qtConfig(webengine-system-$$package) { - skipBuild("A suitable version of $$package could not be found.") - return(false) - } - } + !qtConfig(webengine-embedded-build): qtConfig(xcb) : !qtConfig(webengine-ozone-x11) { + skipBuild("Could not find all necessary libraries for qpa-xcb support") + return(false) } } } diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index 9efa8958f..d3eda85b2 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -121,11 +121,3 @@ defineReplace(pkgConfigHostExecutable) { return($$system_quote($$system_path($$wrapper_name))) } -defineTest(hasX11Dependencies) { - for(package, $$list("libdrm xcomposite xcursor xi xtst")) { - !qtConfig(webengine-system-$$package) { - return(false) - } - } - return(true) -} |