diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-18 19:07:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-18 19:07:30 (GMT) |
| commit | 3b016c33152d50bc6a41b7427036454167d72bf0 (patch) | |
| tree | 049ed0dfc0712ed4a266a282027367bac5805821 /src/gui | |
| parent | be2a2c71a82881c9e78075655c737e89e1dbcaab (diff) | |
| parent | e1989c599e404be834a36f02c51bdd91b720ff6f (diff) | |
| download | Qt-3b016c33152d50bc6a41b7427036454167d72bf0.zip Qt-3b016c33152d50bc6a41b7427036454167d72bf0.tar.gz Qt-3b016c33152d50bc6a41b7427036454167d72bf0.tar.bz2 | |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Fixes leaking X11 SyncCounter when widgets get open/destroyed
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) |