diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-18 06:26:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-18 06:26:50 (GMT) |
| commit | 2dcd6bb37c90d9d0777f25d419324c3d7ec5d722 (patch) | |
| tree | 01ce861d52b18001cdd1006cafec4b445da6ffeb /src | |
| parent | 6827ea5e97c9f6540f0fae5236f89343c32f4cb8 (diff) | |
| parent | b5d357d63aeb28b8be62f1a3004a6a7969c7a81e (diff) | |
| download | Qt-2dcd6bb37c90d9d0777f25d419324c3d7ec5d722.zip Qt-2dcd6bb37c90d9d0777f25d419324c3d7ec5d722.tar.gz Qt-2dcd6bb37c90d9d0777f25d419324c3d7ec5d722.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixes leaking X11 SyncCounter when widgets get open/destroyed
Diffstat (limited to 'src')
| -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 a3173eb..65d9837 100644 --- a/src/gui/kernel/qwidget_x11.cpp +++ b/src/gui/kernel/qwidget_x11.cpp @@ -2827,6 +2827,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) |