diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2014-12-20 06:36:17 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-12-20 07:59:07 +0100 |
| commit | 86d04cfe2bdceca401cab228bd63245f16e65731 (patch) | |
| tree | 4273b2f5879371d130cce0d6a97a7eb75175c980 /src/plugins/platforms/xcb | |
| parent | 0dd38014b307f12368888c089195b084158f94a3 (diff) | |
| parent | e281537f2049af0b96fd87158f2b7212afe8ab5f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/xcb')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbclipboard.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qxcbclipboard.cpp b/src/plugins/platforms/xcb/qxcbclipboard.cpp index 4c070a3d6c..61e9860802 100644 --- a/src/plugins/platforms/xcb/qxcbclipboard.cpp +++ b/src/plugins/platforms/xcb/qxcbclipboard.cpp @@ -742,7 +742,8 @@ void QXcbClipboard::handleXFixesSelectionRequest(xcb_xfixes_selection_notify_eve m_xClipboard[mode]->reset(); } emitChanged(mode); - } + } else if (event->subtype == XCB_XFIXES_SELECTION_EVENT_SELECTION_CLIENT_CLOSE) + emitChanged(mode); } diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index f8b2c4090f..352d3255e4 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -157,7 +157,7 @@ QXcbIntegration::QXcbIntegration(const QStringList ¶meters, 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) |