summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-10 17:47:03 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-10 17:47:03 (GMT)
commitd8af71198528c1e1c9b94471426c67e6deab7576 (patch)
tree2b2afb667d09e5729c763da02afdb49d8b2be599 /src/gui
parent71d4f71c41e8bdfeaf4620a6b174a3dcb6930d23 (diff)
parent349a8e83b8a5dd352fd2db053562b6bd874f30e8 (diff)
downloadQt-d8af71198528c1e1c9b94471426c67e6deab7576.zip
Qt-d8af71198528c1e1c9b94471426c67e6deab7576.tar.gz
Qt-d8af71198528c1e1c9b94471426c67e6deab7576.tar.bz2
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.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/graphicsview/qgraphicsscene.cpp11
1 files changed, 5 insertions, 6 deletions
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);
}
}