diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-18 16:05:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-18 16:05:21 (GMT) |
| commit | e1989c599e404be834a36f02c51bdd91b720ff6f (patch) | |
| tree | a51656f9c64d90f3ad5109a6da8812b34f560d7c /src | |
| parent | 88d6bf04e01f4f006ed2708851e925d59012d591 (diff) | |
| parent | 2dcd6bb37c90d9d0777f25d419324c3d7ec5d722 (diff) | |
| download | Qt-e1989c599e404be834a36f02c51bdd91b720ff6f.zip Qt-e1989c599e404be834a36f02c51bdd91b720ff6f.tar.gz Qt-e1989c599e404be834a36f02c51bdd91b720ff6f.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
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 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) |