diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-01-06 08:46:57 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-01-06 08:46:57 (GMT) |
| commit | 1520af54aff4aece360dad7310d742ede3317c63 (patch) | |
| tree | 465bbe68ebbb0e5adaf696797916de867cb4e256 /src | |
| parent | 965d0b477c13e2f92866cecb73064c3f0d722714 (diff) | |
| parent | e93f6fa2aa832037467e335641067c69832455da (diff) | |
| download | Qt-1520af54aff4aece360dad7310d742ede3317c63.zip Qt-1520af54aff4aece360dad7310d742ede3317c63.tar.gz Qt-1520af54aff4aece360dad7310d742ede3317c63.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget_x11.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 4165c95..cdd0c1b 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -5230,6 +5230,8 @@ QInputContext *QApplication::inputContext() const { Q_D(const QApplication); Q_UNUSED(d);// only static members being used. + if (QApplicationPrivate::is_app_closing) + return d->inputContext; #ifdef Q_WS_X11 if (!X11) return 0; diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp index 0bc9cbc..f9db485 100644 --- a/src/gui/kernel/qwidget_x11.cpp +++ b/src/gui/kernel/qwidget_x11.cpp @@ -1084,7 +1084,7 @@ void QWidget::destroy(bool destroyWindow, bool destroySubWindows) } else { // release previous focus information participating with // preedit preservation of qic - QInputContext *qic = inputContext(); + QInputContext *qic = QApplicationPrivate::inputContext; if (qic) qic->widgetDestroyed(this); } |