Merge commit 'qt/master-stable' into 4.6-merged

Conflicts:
	.gitignore
	configure.exe
	src/corelib/concurrent/qtconcurrentthreadengine.h
	src/corelib/global/qnamespace.h
	src/gui/graphicsview/qgraphicssceneevent.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qapplication_p.h
	src/gui/kernel/qapplication_qws.cpp
	src/gui/kernel/qwidget.h
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/text/qfontdatabase.cpp
	src/network/access/qnetworkaccesshttpbackend.cpp
	tests/auto/network-settings.h
	tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
	tests/auto/qvariant/tst_qvariant.cpp

1 files changed, 126 insertions, 0 deletions

diff --git a/src/gui/kernel/qgesturemanager_p.h b/src/gui/kernel/qgesturemanager_p.h
new file mode 100644
index 0000000..8656590
--- /dev/null
+++ b/src/gui/kernel/qgesturemanager_p.h
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QGESTUREMANAGER_P_H
+#define QGESTUREMANAGER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qlist.h"
+#include "qset.h"
+#include "qevent.h"
+#include "qbasictimer.h"
+#include "qpointer.h"
+
+#include "qgesturerecognizer.h"
+
+QT_BEGIN_NAMESPACE
+
+class QWidget;
+class Q_AUTOTEST_EXPORT QGestureManager : public QObject
+{
+    Q_OBJECT
+public:
+    QGestureManager(QObject *parent);
+
+    int eventDeliveryDelay() const;
+    void setEventDeliveryDelay(int ms);
+
+    void addRecognizer(QGestureRecognizer *recognizer);
+    void removeRecognizer(QGestureRecognizer *recognizer);
+
+    bool filterEvent(QWidget *receiver, QEvent *event);
+    bool inGestureMode();
+
+    int makeGestureId(const QString &name);
+    void releaseGestureId(int gestureId);
+    QString gestureNameFromId(int gestureId) const;
+
+    // declared in qapplication.cpp
+    static QGestureManager* instance();
+
+    bool sendGestureEvent(QWidget *receiver,
+                          const QSet<QGesture*> &startedGestures,
+                          const QSet<QGesture*> &updatedGestures,
+                          const QSet<QString> &cancelled = QSet<QString>());
+
+protected:
+    void timerEvent(QTimerEvent *event);
+
+private slots:
+    void recognizerStateChanged(QGestureRecognizer::Result);
+
+private:
+    QSet<QGestureRecognizer*> activeGestures;
+    QMap<QGestureRecognizer*, int> maybeGestures;
+    QSet<QGestureRecognizer*> recognizers;
+
+    QPoint lastPos;
+
+    int eventDeliveryDelayTimeout;
+    int delayedPressTimer;
+    QPointer<QWidget> lastMousePressReceiver;
+    QMouseEvent lastMousePressEvent;
+
+    QMap<int, QString> gestureIdMap;
+    int lastGestureId;
+
+    enum State {
+        Gesture,
+        NotGesture,
+        MaybeGesture // that mean timers are up and waiting for some
+                     // more events, and input events are handled by
+                     // gesture recognizer explicitely
+    } state;
+};
+
+QT_END_NAMESPACE
+
+#endif // QGESTUREMANAGER_P_H