summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-01-12 08:42:00 (GMT)
committerJesper Thomschutz <jesper.thomschutz@nokia.com>2010-01-13 09:24:04 (GMT)
commitb76d3f7e6d4fe2acc874b91515a4ae33388748cb (patch)
treed4085fab34181e0745dff48b3b33e93794a53110
parent7a8ee6b2f3c9c7cc6a2833ea332a3e35a4958f6e (diff)
downloadQt-b76d3f7e6d4fe2acc874b91515a4ae33388748cb.zip
Qt-b76d3f7e6d4fe2acc874b91515a4ae33388748cb.tar.gz
Qt-b76d3f7e6d4fe2acc874b91515a4ae33388748cb.tar.bz2
Prevent a crash when creating an inputContext from the QApplication dtor.
Complete the fix in f72165460d27860cabd51691f4d935fd74b50f80 by applying the same fix to Symbian and QWS. Task-number: QTBUG-7105 Reviewed-by: Alexis Reviewed-by: Jason McDonald (cherry picked from commit 8b56ffee8bb4ec0c56c2c05ccc1e088f6d9ae8a8)
-rw-r--r--src/gui/kernel/qwidget_qws.cpp2
-rw-r--r--src/gui/kernel/qwidget_s60.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget_qws.cpp b/src/gui/kernel/qwidget_qws.cpp
index e6b473d..f5f9ed6 100644
--- a/src/gui/kernel/qwidget_qws.cpp
+++ b/src/gui/kernel/qwidget_qws.cpp
@@ -287,7 +287,7 @@ void QWidget::destroy(bool destroyWindow, bool destroySubWindows)
} else {
// release previous focus information participating with
// preedit preservation of qic -- while we still have a winId
- QInputContext *qic = inputContext();
+ QInputContext *qic = QApplicationPrivate::inputContext;
if (qic)
qic->widgetDestroyed(this);
}
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index bab3b40..0e92db5 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -1152,7 +1152,7 @@ void QWidget::destroy(bool destroyWindow, bool destroySubWindows)
if (d->ic) {
delete d->ic;
} else {
- QInputContext *ic = inputContext();
+ QInputContext *ic = QApplicationPrivate::inputContext;
if (ic) {
ic->widgetDestroyed(this);
}