diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-04-05 14:43:20 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-04-05 14:43:20 (GMT) |
| commit | a343e8674947415f8ef3319c62a88f72458f25ad (patch) | |
| tree | 54cf25c81f94911bf66b1f9f564970e91df3fdbe /src/gui/inputmethod/qcoefepinputcontext_s60.cpp | |
| parent | 87a28f7ab7b1b94072e75740d690192bbdcfdaa5 (diff) | |
| parent | a01e0d1928aa17690d3e0ebadbac7b95bf0f0e84 (diff) | |
| download | Qt-a343e8674947415f8ef3319c62a88f72458f25ad.zip Qt-a343e8674947415f8ef3319c62a88f72458f25ad.tar.gz Qt-a343e8674947415f8ef3319c62a88f72458f25ad.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/gui/inputmethod/qcoefepinputcontext_s60.cpp')
| -rw-r--r-- | src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index 41abe95..2c70ade 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -416,7 +416,8 @@ void QCoeFepInputContext::resetSplitViewWidget(bool keepInputWidget) int index = gv->scene()->focusItem()->toGraphicsObject()->metaObject()->indexOfSignal(signal.right(signal.length() - 1)); if (index != -1) disconnect(gv->scene()->focusItem()->toGraphicsObject(), SIGNAL(cursorPositionChanged()), this, SLOT(translateInputWidget())); - QGraphicsItem *rootItem; + + QGraphicsItem *rootItem = 0; foreach (QGraphicsItem *item, gv->scene()->items()) { if (!item->parentItem()) { rootItem = item; @@ -828,7 +829,7 @@ void QCoeFepInputContext::translateInputWidget() return; // Fetch root item (i.e. graphicsitem with no parent) - QGraphicsItem *rootItem; + QGraphicsItem *rootItem = 0; foreach (QGraphicsItem *item, gv->scene()->items()) { if (!item->parentItem()) { rootItem = item; |