diff options
| author | Gatis Paeglis <gatis.paeglis@qt.io> | 2017-02-23 14:33:57 +0100 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2017-02-24 19:42:21 +0000 |
| commit | d37c353dc0f2ae5bb803fe9e5752eff846246439 (patch) | |
| tree | 65cbef56b44d1ee6381b99cdb84f5e6611ee6b2d /src/gui/configure.json | |
| parent | b9c5c7139ea1054f69a1c43ca2cd7212206a41e5 (diff) | |
remove unused Xlib's XRender dependency
We do use xcb-xrender, and it has its own detection
logic in configure.json.
Change-Id: I20bbc1ddf5dd0c32e93ef2c12c7b0eda3f96f4f4
Reviewed-by: Alexander Volkov <a.volkov@rusbitech.ru>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 68bc43b5ca..81fa0db76f 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -43,8 +43,7 @@ "xkb-config-root": "string", "xkbcommon": { "type": "enum", "values": [ "no", "qt", "system" ] }, "xkbcommon-evdev": "boolean", - "xkbcommon-x11": { "type": "enum", "name": "xkbcommon", "values": [ "no", "qt", "system" ] }, - "xrender": "boolean" + "xkbcommon-x11": { "type": "enum", "name": "xkbcommon", "values": [ "no", "qt", "system" ] } } }, @@ -285,13 +284,6 @@ "sources": [ { "type": "pkgConfig", "args": "xkbcommon xkbcommon-x11 >= 0.4.1" } ] - }, - "xrender": { - "label": "XRender", - "test": "x11/xrender", - "sources": [ - "-lXrender" - ] } }, @@ -776,11 +768,6 @@ "condition": "tests.xlib", "output": [ "privateFeature" ] }, - "xrender": { - "label": "Xrender", - "condition": "libs.xrender", - "output": [ "privateFeature", "feature" ] - }, "texthtmlparser": { "label": "HtmlParser", "purpose": "Provides a parser for HTML.", @@ -1108,7 +1095,7 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla "section": "X11", "condition": "features.xcb", "entries": [ - "system-xcb", "egl_x11", "xinput2", "xkb", "xlib", "xrender", "xcb-render", "xcb-glx", "xcb-xlib", "xkbcommon-system" + "system-xcb", "egl_x11", "xinput2", "xkb", "xlib", "xcb-render", "xcb-glx", "xcb-xlib", "xkbcommon-system" ] }, { |