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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits)
  Replaced redundant "!contains" scopes in "contains(A, B) {...} !contains(A, B) {...}" constructions with "else"
  Updated leading whitespace to make indentation more consistent
  Updated project files so it is now possible to use "-system-zlib" configuration option on Windows and Symbian platforms.
  make postgresql support sensitive to PSQL_LIBS
  support for cross building Qt for MinGW (win32-g++) on Unix
  use "win32-g++*" scope to match all MinGW makespecs
  Demos: Fix compilation with namespace.
  actually fix namespaced compile
  Attempt to fix build failure on Linux introduced by 09c6a81109
  minor cosmetic improvements
  designer: add sorting in signal-slot editor window
  deprecate header files in $$QT_BUILD_TREE/include/Qt
  syncqt: change tabs to spaces
  I10n: Update German translations for 4.7.0
  Fix a freetype link failure.
  Fix configure test for DirectFB
  Split Symbian bearer plugin into three platform specfic plugins
  Doc: Fixed whitespace in the other configuration file for zh_CN.
  Doc: Fixed whitespace in the Simplified Chinese doc configuration.
  Unbreak Linux build when qendian.h is included before qglobal.h
  ...

1 files changed, 6 insertions, 2 deletions

diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/gui/kernel/qgesturemanager.cpp
index 2af031b..e43a560 100644
--- a/src/gui/kernel/qgesturemanager.cpp
+++ b/src/gui/kernel/qgesturemanager.cpp
@@ -286,6 +286,9 @@ bool QGestureManager::filterEventThroughContexts(const QMultiMap<QObject *,
     // check if a running gesture switched back to maybe state
     QSet<QGesture *> activeToMaybeGestures = m_activeGestures & newMaybeGestures;
 
+    // check if a maybe gesture switched to canceled - reset it but don't send an event
+    QSet<QGesture *> maybeToCanceledGestures = m_maybeGestures & notGestures;
+
     // check if a running gesture switched back to not gesture state,
     // i.e. were canceled
     QSet<QGesture *> canceledGestures = m_activeGestures & notGestures;
@@ -345,7 +348,8 @@ bool QGestureManager::filterEventThroughContexts(const QMultiMap<QObject *,
                 << "\n\tstarted:" << startedGestures
                 << "\n\ttriggered:" << triggeredGestures
                 << "\n\tfinished:" << finishedGestures
-                << "\n\tcanceled:" << canceledGestures;
+                << "\n\tcanceled:" << canceledGestures
+                << "\n\tmaybe-canceled:" << maybeToCanceledGestures;
     }
 
     QSet<QGesture *> undeliveredGestures;
@@ -366,7 +370,7 @@ bool QGestureManager::filterEventThroughContexts(const QMultiMap<QObject *,
 
     // reset gestures that ended
     QSet<QGesture *> endedGestures =
-            finishedGestures + canceledGestures + undeliveredGestures;
+            finishedGestures + canceledGestures + undeliveredGestures + maybeToCanceledGestures;
     foreach (QGesture *gesture, endedGestures) {
         recycle(gesture);
         m_gestureTargets.remove(gesture);