Merge remote-tracking branch 'upstream/4.7' into 4.7

Conflicts: src/gui/inputmethod/qcoefepinputcontext_s60.cpp
PaPaNebo · Oct 27, 2011 · 5c02fd9 · 5c02fd9
2 parents 6937461 + 7a0cdd8
commit 5c02fd9
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/doc/src/getting-started/gettingstartedqt.qdoc b/doc/src/getting-started/gettingstartedqt.qdoc
@@ -374,7 +374,7 @@
     \code
 25        Notepad::Notepad()
 26        {
-27            saveAction = new QAction(tr("&Open"), this);
+27            openAction = new QAction(tr("&Open"), this);
 28            saveAction = new QAction(tr("&Save"), this);
 29            exitAction = new QAction(tr("E&xit"), this);
 30

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -2852,6 +2852,11 @@ void QDeclarativeGridView::itemsInserted(int modelIndex, int count)
             addedVisible = true;
         }
         FxGridItem *item = d->createItem(modelIndex + i);
+        if (!item) {
+            // broken or no delegate
+            d->clear();
+            return;
+        }
         d->visibleItems.insert(index, item);
         item->setPosition(colPos, rowPos);
         added.append(item);
@@ -3042,6 +3047,11 @@ void QDeclarativeGridView::itemsMoved(int from, int to, int count)
             FxGridItem *movedItem = moved.take(item->index);
             if (!movedItem)
                 movedItem = d->createItem(item->index);
+            if (!movedItem) {
+                // broken or no delegate
+                d->clear();
+                return;
+            }
             it = d->visibleItems.insert(it, movedItem);
             if (it == d->visibleItems.begin() && firstItem)
                 movedItem->setPosition(firstItem->colPos(), firstItem->rowPos());

diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -3283,6 +3283,11 @@ void QDeclarativeListView::itemsInserted(int modelIndex, int count)
                 addedVisible = true;
             }
             FxListItem *item = d->createItem(modelIndex + i);
+            if (!item) {
+                // broken or no delegate
+                d->clear();
+                return;
+            }
             d->visibleItems.insert(insertionIdx, item);
             pos -= item->size() + d->spacing;
             item->setPosition(pos);
@@ -3313,6 +3318,11 @@ void QDeclarativeListView::itemsInserted(int modelIndex, int count)
                 addedVisible = true;
             }
             FxListItem *item = d->createItem(modelIndex + i);
+            if (!item) {
+                // broken or no delegate
+                d->clear();
+                return;
+            }
             d->visibleItems.insert(index, item);
             item->setPosition(pos);
             added.append(item);
@@ -3516,6 +3526,11 @@ void QDeclarativeListView::itemsMoved(int from, int to, int count)
             FxListItem *movedItem = moved.take(item->index);
             if (!movedItem)
                 movedItem = d->createItem(item->index);
+            if (!movedItem) {
+                // broken or no delegate
+                d->clear();
+                return;
+            }
             if (item->index <= firstVisible->index)
                 moveBy -= movedItem->size();
             it = d->visibleItems.insert(it, movedItem);

diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -164,7 +164,7 @@ void QCoeFepInputContext::reset()
     // text.
     if (m_cachedPreeditString.isEmpty() && !(currentHints & Qt::ImhNoPredictiveText)) {
         m_cachedPreeditString = m_preeditString;
-        if (focusWidget()) {
+        if (focusWidget() && !m_cachedPreeditString.isEmpty()) {
             int cursor = focusWidget()->inputMethodQuery(Qt::ImCursorPosition).toInt();
             int anchor = focusWidget()->inputMethodQuery(Qt::ImAnchorPosition).toInt();
             if (cursor == anchor)