diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-02 14:43:11 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-02 14:43:11 (GMT) |
| commit | 2ed925753cb194970712330edca4da8e91fa8f28 (patch) | |
| tree | d06c72229e1afeac25989a5409b052fa5cefeda6 /src/gui/kernel/qwidget_qws.cpp | |
| parent | cf800465369fb1ef84e8bddbbbfa7128d95afd27 (diff) | |
| parent | 5e0bdffd92cbff2a9eb551f77850a24bf2a2116a (diff) | |
| download | Qt-2ed925753cb194970712330edca4da8e91fa8f28.zip Qt-2ed925753cb194970712330edca4da8e91fa8f28.tar.gz Qt-2ed925753cb194970712330edca4da8e91fa8f28.tar.bz2 | |
Merge branch 'feature' into 4.6
Diffstat (limited to 'src/gui/kernel/qwidget_qws.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget_qws.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_qws.cpp b/src/gui/kernel/qwidget_qws.cpp index 0f46016..e299c6e 100644 --- a/src/gui/kernel/qwidget_qws.cpp +++ b/src/gui/kernel/qwidget_qws.cpp @@ -280,7 +280,7 @@ void QWidget::destroy(bool destroyWindow, bool destroySubWindows) QApplicationPrivate::leaveModal(this); else if ((windowType() == Qt::Popup)) qApp->d_func()->closePopup(this); - +#ifndef QT_NO_IM if (d->ic) { delete d->ic; d->ic =0; @@ -291,6 +291,7 @@ void QWidget::destroy(bool destroyWindow, bool destroySubWindows) if (qic) qic->widgetDestroyed(this); } +#endif //QT_NO_IM if ((windowType() == Qt::Desktop)) { } else { |