summaryrefslogtreecommitdiffstats
path: root/src/gui/inputmethod
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-07 16:08:38 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-07 16:08:38 (GMT)
commitc6a8f35846df86a87591372d022e54a701591f5b (patch)
tree471f5eb02ccee400c2587e8b3fae55b922d848d1 /src/gui/inputmethod
parentd4c00ffb6f01a991118388957de831394c8ad9c1 (diff)
parent1dd89b6ad0546f247486b63f72035baf21475b51 (diff)
downloadQt-c6a8f35846df86a87591372d022e54a701591f5b.zip
Qt-c6a8f35846df86a87591372d022e54a701591f5b.tar.gz
Qt-c6a8f35846df86a87591372d022e54a701591f5b.tar.bz2
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/gui/inputmethod')
-rw-r--r--src/gui/inputmethod/qcoefepinputcontext_s60.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index c9d7269..3407502 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -874,6 +874,8 @@ void QCoeFepInputContext::ensureInputCapabilitiesChanged()
void QCoeFepInputContext::translateInputWidget()
{
QGraphicsView *gv = qobject_cast<QGraphicsView *>(S60->splitViewLastWidget);
+ if (!gv)
+ return;
QRect splitViewRect = qt_TRect2QRect(static_cast<CEikAppUi*>(S60->appUi())->ClientRect());
QRectF cursor = gv->scene()->inputMethodQuery(Qt::ImMicroFocus).toRectF();