diff options
| -rw-r--r-- | mkspecs/features/configure.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/functions.prf | 2 | ||||
| -rw-r--r-- | src/core/configure.json | 12 | ||||
| -rw-r--r-- | src/core/core_chromium.pri | 2 |
4 files changed, 3 insertions, 15 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) } diff --git a/src/core/configure.json b/src/core/configure.json index e17605302..044d85527 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -75,12 +75,6 @@ { "type": "pkgConfig", "args": "xi" } ] }, - "webengine-xrandr": { - "label": "xrandr", - "sources": [ - { "type": "pkgConfig", "args": "xrandr" } - ] - }, "webengine-xtst": { "label": "xtst", "sources": [ @@ -366,11 +360,6 @@ "condition": "libs.webengine-xi", "output": [ "privateFeature" ] }, - "webengine-system-xrandr": { - "label": "xrandr", - "condition": "libs.webengine-xrandr", - "output": [ "privateFeature" ] - }, "webengine-system-xtst": { "label": "xtst", "condition": "libs.webengine-xtst", @@ -825,7 +814,6 @@ "webengine-system-xcomposite", "webengine-system-xcursor", "webengine-system-xi", - "webengine-system-xrandr", "webengine-system-xtst" ] } diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri index ae529d86a..e92dd60ff 100644 --- a/src/core/core_chromium.pri +++ b/src/core/core_chromium.pri @@ -221,7 +221,7 @@ HEADERS = \ web_event_factory.h -qtConfig(webengine-system-x11) { +qtConfig(webengine-system-x11): hasX11Dependencies() { HEADERS += ozone/gl_ozone_glx_qt.h \ ozone/gl_surface_glx_qt.h SOURCES += ozone/gl_surface_glx_qt.cpp \ |