diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-21 17:34:59 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-21 18:39:13 +0200 |
commit | 4cebef621bb108c76f3cc8bfd0fdf77174b6499d (patch) | |
tree | 657eceb4539343312e7cd33b3644d1b1ec116ae2 /src/plugins/platforms/xcb/qxcbconnection.cpp | |
parent | 8969f57b6abef31d2e27500742dffa5498e38a46 (diff) | |
parent | a5d34b34fbd867bd13ce94cdaf55d96576d4d14d (diff) |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection.cpp')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index ff5b36c448..d6f64d29fd 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -1164,6 +1164,12 @@ void QXcbConnection::processXcbEvents() continue; } + bool accepted = false; + if (clipboard()->processIncr()) + clipboard()->incrTransactionPeeker(event, accepted); + if (accepted) + continue; + QVector<PeekFunc>::iterator it = m_peekFuncs.begin(); while (it != m_peekFuncs.end()) { // These callbacks return true if the event is what they were |