summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-01-12 08:42:00 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-01-12 08:45:01 (GMT)
commit8b56ffee8bb4ec0c56c2c05ccc1e088f6d9ae8a8 (patch)
tree06528b9d5b153aa054d9907f65e5762e92568c12 /src/gui
parentf08189b8d7abb17e2694c4049184bbbf7837fd19 (diff)
downloadQt-8b56ffee8bb4ec0c56c2c05ccc1e088f6d9ae8a8.zip
Qt-8b56ffee8bb4ec0c56c2c05ccc1e088f6d9ae8a8.tar.gz
Qt-8b56ffee8bb4ec0c56c2c05ccc1e088f6d9ae8a8.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
Diffstat (limited to 'src/gui')
-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 1f1dac6..b827e8b 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 75c2e31..c65a162 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);
}