diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-07-19 23:00:13 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-07-19 23:00:13 (GMT) |
| commit | e8550a527889e9c42056a6a417a0b16c5b2b07c0 (patch) | |
| tree | f111fc9eab7f032a1dae518ccfaddaf186d3bbd6 /src/gui | |
| parent | fa83e6d6dce23d7ed99dfd01eabb1e00f87eb99b (diff) | |
| parent | 3b016c33152d50bc6a41b7427036454167d72bf0 (diff) | |
| download | Qt-e8550a527889e9c42056a6a417a0b16c5b2b07c0.zip Qt-e8550a527889e9c42056a6a417a0b16c5b2b07c0.tar.gz Qt-e8550a527889e9c42056a6a417a0b16c5b2b07c0.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qwidget_x11.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp index eaa9405..f99cc2c 100644 --- a/src/gui/kernel/qwidget_x11.cpp +++ b/src/gui/kernel/qwidget_x11.cpp @@ -2879,6 +2879,12 @@ void QWidgetPrivate::deleteTLSysExtra() { // don't destroy input context here. it will be destroyed in // QWidget::destroy() destroyInputContext(); +#ifndef QT_NO_XSYNC + if (extra && extra->topextra && extra->topextra->syncUpdateCounter) { + XSyncDestroyCounter(X11->display, extra->topextra->syncUpdateCounter); + extra->topextra->syncUpdateCounter = 0; + } +#endif } void QWidgetPrivate::registerDropSite(bool on) |