From 083d3b885e9ec5f154043fbc3b0f07a2cbd6cb1e Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Tue, 5 Dec 2017 12:29:11 +0100 Subject: [PATCH] xcb: remove redundant QT_XCB_DEBUG_XINPUT* envvars In Qt 5.4 these envvars were replaced with categorized logging 59ba84d31cf17d86e615e2958fece6f6e0bbefe2. This is not a public API, the log output is useful mostly for developers and it can still be used via QT_LOGGING_RULES, so there is no good reason to keep the old envvars around. By using QT_LOGGING_RULES, we can access even more xinput2 logs than is available via QT_XCB_DEBUG_XINPUT*. Change-Id: I2b12b8696043bc8bf8310f49f0cdc2ba1b8708ba Reviewed-by: Shawn Rutledge --- src/plugins/platforms/xcb/qxcbconnection_xi2.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp index e60b5213ff..2fc39012ce 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp @@ -52,12 +52,6 @@ void QXcbConnection::initializeXInput2() { - // TODO Qt 6 (or perhaps earlier): remove these redundant env variables - if (qEnvironmentVariableIsSet("QT_XCB_DEBUG_XINPUT")) - const_cast(lcQpaXInput()).setEnabled(QtDebugMsg, true); - if (qEnvironmentVariableIsSet("QT_XCB_DEBUG_XINPUT_DEVICES")) - const_cast(lcQpaXInputDevices()).setEnabled(QtDebugMsg, true); - Display *xDisplay = static_cast(m_xlib_display); if (XQueryExtension(xDisplay, "XInputExtension", &m_xiOpCode, &m_xiEventBase, &m_xiErrorBase)) { int xiMajor = 2;