Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Improved mapping of locales on symbian.
  An improvement to the previous commit.

2 files changed, 6 insertions, 7 deletions

diff --git a/src/corelib/tools/qlocale_symbian.cpp b/src/corelib/tools/qlocale_symbian.cpp
index b1a7caa..2e5daec 100644
--- a/src/corelib/tools/qlocale_symbian.cpp
+++ b/src/corelib/tools/qlocale_symbian.cpp
@@ -134,7 +134,7 @@ static const symbianToISO symbian_to_iso_list[] = {
     { ELangBrazilianPortuguese, "pt_BR" },
     { ELangRomanian,            "ro_RO" },
     { ELangSerbian,             "sr_YU" },
-    { ELangLatinAmericanSpanish, "es" },
+    { ELangLatinAmericanSpanish,"es_MX" }, // TODO: should be es_419
     { ELangUkrainian,           "uk_UA" },
     { ELangUrdu,                "ur_PK" }, // India/Pakistan
     { ELangVietnamese,          "vi_VN" },
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 2131993..c5e3644 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -696,10 +696,10 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item)
 
     QHash<QGesture *, QGraphicsObject *>::iterator it;
     for (it = gestureTargets.begin(); it != gestureTargets.end();) {
-      if (it.value() == item)
-       it = gestureTargets.erase(it);
-      else
-       ++it;
+        if (it.value() == item)
+            it = gestureTargets.erase(it);
+        else
+            ++it;
     }
 }
 
@@ -5968,8 +5968,7 @@ void QGraphicsScenePrivate::gestureEventHandler(QGestureEvent *event)
             if (gesture->state() == Qt::GestureStarted)
                 startedGestures.insert(gesture);
         } else {
-            if (index->items().contains(target))
-                gesturesPerItem[target].append(gesture);
+            gesturesPerItem[target].append(gesture);
         }
     }