summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@theqtcompany.com>2014-12-04 13:30:40 +0100
committerJørgen Lind <jorgen.lind@theqtcompany.com>2014-12-12 16:38:02 +0100
commit2e2de5e4820a928e017d3b92e826e23d95805fca (patch)
tree8f7dc7aaf95c8a092afe777968f8c40461a0ef81 /src/plugins/platforms
parent71a63836ed5d21feacbfcdbfdbd4b405f635282f (diff)
Fix xcb backend not grabbing the server as default
The xcb backend relies on grabbing the x server in a few situations like popuphandling. For Qt 5.4.0 the logic enabling this code path was moved into the plugin. However it defaults to never grabbing the server Change-Id: I82489a0727affbce62587b3d7470085cf716a0cc Task-number: QTBUG-43049 Reviewed-by: Martin Gräßlin <mgraesslin@kde.org> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r--src/plugins/platforms/xcb/qxcbintegration.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp
index 3818494d99..f0c4a7f691 100644
--- a/src/plugins/platforms/xcb/qxcbintegration.cpp
+++ b/src/plugins/platforms/xcb/qxcbintegration.cpp
@@ -165,7 +165,7 @@ QXcbIntegration::QXcbIntegration(const QStringList &parameters, int &argc, char
"\t Use the -dograb option to enforce grabbing.");
}
#endif
- m_canGrab = (!underDebugger && noGrabArg) || (underDebugger && doGrabArg);
+ m_canGrab = (!underDebugger && !noGrabArg) || (underDebugger && doGrabArg);
static bool canNotGrabEnv = qEnvironmentVariableIsSet("QT_XCB_NO_GRAB_SERVER");
if (canNotGrabEnv)