diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-09-19 10:29:05 -0700 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2017-09-21 11:47:58 +0000 |
| commit | 64ab7489b3d1ee9cc473d900e08f64d45412e1fc (patch) | |
| tree | 939107bf6ce98c080f4b9803593f9cb2f2f16991 | |
| parent | 72188001bbb408be22e5ad0fc90ca13b97c408f8 (diff) | |
XCB: also test for Xinerama's presence
It's included unconditionally from qxcbconnection.cpp and qxcbscreen.h.
Task-number: QTBUG-53537
Change-Id: I6e1fe42ae4b742a7b811fffd14e5d374155660f3
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
| -rw-r--r-- | src/gui/configure.json | 5 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/xcb_qpa_lib.pro | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 6fdeefe14a..28c8034c75 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -433,6 +433,7 @@ "xcb/xfixes.h", "xcb/xcb_image.h", "xcb/xcb_keysyms.h", + "xcb/xinerama.h", "xcb/sync.h", "xcb/randr.h", "xcb/shm.h" @@ -450,8 +451,8 @@ }, "sources": [ { "type": "pkgConfig", - "args": "xcb xcb-shm xcb-sync xcb-xfixes xcb-randr xcb-image xcb-keysyms xcb-icccm xcb-shape" }, - "-lxcb -lxcb-shm -lxcb-sync -lxcb-xfixes -lxcb-randr -lxcb-image -lxcb-keysyms -lxcb-icccm -lxcb-shape" + "args": "xcb xcb-shm xcb-sync xcb-xfixes xcb-xinerama xcb-randr xcb-image xcb-keysyms xcb-icccm xcb-shape" }, + "-lxcb -lxcb-shm -lxcb-sync -lxcb-xfixes -lxcb-xinerama -lxcb-randr -lxcb-image -lxcb-keysyms -lxcb-icccm -lxcb-shape" ] }, "xcb_xlib": { diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro index 1c76b49650..284711075e 100644 --- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro +++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro @@ -69,7 +69,6 @@ include(gl_integrations/gl_integrations.pri) !qtConfig(system-xcb) { QMAKE_USE += xcb-static xcb } else { - LIBS += -lxcb-xinerama ### there is no configure test for this! qtConfig(xkb): QMAKE_USE += xcb_xkb qtConfig(xcb-render): QMAKE_USE += xcb_render QMAKE_USE += xcb_syslibs |