diff options
author | Liang Qi <liang.qi@qt.io> | 2020-08-25 11:19:13 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-09-04 17:28:49 +0000 |
commit | c91d1fdc100cda88b94217153def52ab7fe63d21 (patch) | |
tree | fe14d83da1c305946aaefaaffbd8425f16175bcd /src/plugins/platforms/xcb/qxcbconnection_basic.cpp | |
parent | d85bc34b7906a91c1afc3d7adc5feace53057d6a (diff) |
xcb: drop Xinerama support
[ChangeLog][Important Behavior Changes][X11] Xinerama is no longer
supported.
Fixes: QTBUG-86082
Change-Id: Ieb57d9035e1659fc22bf8333247fc3573fb62992
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection_basic.cpp')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection_basic.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection_basic.cpp b/src/plugins/platforms/xcb/qxcbconnection_basic.cpp index 18dee89adb..020412fc87 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_basic.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection_basic.cpp @@ -43,7 +43,6 @@ #include <xcb/shm.h> #include <xcb/sync.h> #include <xcb/xfixes.h> -#include <xcb/xinerama.h> #include <xcb/render.h> #include <xcb/xinput.h> #define explicit dont_use_cxx_explicit @@ -145,8 +144,6 @@ QXcbBasicConnection::QXcbBasicConnection(const char *displayName) initializeShm(); if (!qEnvironmentVariableIsSet("QT_XCB_NO_XRANDR")) initializeXRandr(); - if (!m_hasXRandr) - initializeXinerama(); initializeXFixes(); initializeXRender(); if (!qEnvironmentVariableIsSet("QT_XCB_NO_XI2")) @@ -307,17 +304,6 @@ void QXcbBasicConnection::initializeXRender() m_xrenderVersion.second = xrenderQuery->minor_version; } -void QXcbBasicConnection::initializeXinerama() -{ - const xcb_query_extension_reply_t *reply = xcb_get_extension_data(m_xcbConnection, &xcb_xinerama_id); - if (!reply || !reply->present) - return; - - auto xineramaActive = Q_XCB_REPLY(xcb_xinerama_is_active, m_xcbConnection); - if (xineramaActive && xineramaActive->state) - m_hasXinerama = true; -} - void QXcbBasicConnection::initializeXFixes() { const xcb_query_extension_reply_t *reply = xcb_get_extension_data(m_xcbConnection, &xcb_xfixes_id); |