Merge commit 'origin/4.6' into mmfphonon

Conflicts:
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/kernel/qcoreevent.h

3 files changed, 7 insertions, 2 deletions

diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp
index 44a354b..9098515 100644
--- a/src/corelib/kernel/qcoreevent.cpp
+++ b/src/corelib/kernel/qcoreevent.cpp
@@ -229,6 +229,8 @@ QT_BEGIN_NAMESPACE
     \value TouchUpdate                      Touch-screen event (QTouchEvent)
     \value TouchEnd                         End of touch-event sequence (QTouchEvent)
     \value WinIdChange                      The window system identifer for this native widget has changed
+    \value Gesture                          A gesture was triggered (QGestureEvent)
+    \value GestureOverride                  A gesture override was triggered (QGestureEvent)
 
     User events should have values between \c User and \c{MaxUser}:
 
diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h
index 99280d3..6427d17 100644
--- a/src/corelib/kernel/qcoreevent.h
+++ b/src/corelib/kernel/qcoreevent.h
@@ -284,6 +284,8 @@ public:
         UpdateSoftKeys = 201,                   // Internal for compressing soft key updates
 
         WinIdChange = 203,
+        Gesture = 198,
+        GestureOverride = 202,
 
         // 512 reserved for Qt Jambi's MetaCall event
         // 513 reserved for Qt Jambi's DeleteOnMainThread event
@@ -326,6 +328,7 @@ private:
     friend class QGraphicsView;
     friend class QGraphicsViewPrivate;
     friend class QGraphicsScenePrivate;
+    friend class QGestureManager;
 };
 
 class Q_CORE_EXPORT QTimerEvent : public QEvent
diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp
index acbb7e4..02f77a1 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian.cpp
+++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp
@@ -749,11 +749,11 @@ bool QEventDispatcherSymbian::processEvents ( QEventLoop::ProcessEventsFlags fla
             block = false;
             if (timeState == TimeStarted && time.elapsed() > 100) {
                 priority = m_processHandle.Priority();
-                m_processHandle.SetPriority(EPriorityLow);
+                m_processHandle.SetPriority(EPriorityBackground);
                 time.start();
                 // Slight chance of race condition in the next lines, but nothing fatal
                 // will happen, just wrong priority.
-                if (m_processHandle.Priority() == EPriorityLow) {
+                if (m_processHandle.Priority() == EPriorityBackground) {
                     m_processHandle.SetPriority(priority);
                 }
             }