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, 94 insertions, 0 deletions

diff --git a/tests/manual/qtouchevent/touchwidget.cpp b/tests/manual/qtouchevent/touchwidget.cpp
new file mode 100644
index 0000000..a8141cc
--- /dev/null
+++ b/tests/manual/qtouchevent/touchwidget.cpp
@@ -0,0 +1,94 @@
+#include "touchwidget.h"
+
+#include <QApplication>
+#include <QtEvents>
+#include <QTimer>
+#include <QTouchEvent>
+
+void TouchWidget::reset()
+{
+    acceptTouchBegin
+        = acceptTouchUpdate
+        = acceptTouchEnd
+        = seenTouchBegin
+        = seenTouchUpdate
+        = seenTouchEnd
+        = closeWindowOnTouchEnd
+
+        = acceptMousePress
+        = acceptMouseMove
+        = acceptMouseRelease
+        = seenMousePress
+        = seenMouseMove
+        = seenMouseRelease
+        = closeWindowOnMouseRelease
+
+        = false;
+    touchPointCount = 0;
+}
+
+bool TouchWidget::event(QEvent *event)
+{
+    switch (event->type()) {
+    case QEvent::TouchBegin:
+        if (seenTouchBegin) qWarning("TouchBegin: already seen a TouchBegin");
+        if (seenTouchUpdate) qWarning("TouchBegin: TouchUpdate cannot happen before TouchBegin");
+        if (seenTouchEnd) qWarning("TouchBegin: TouchEnd cannot happen before TouchBegin");
+        seenTouchBegin = !seenTouchBegin && !seenTouchUpdate && !seenTouchEnd;
+        touchPointCount = qMax(touchPointCount, static_cast<QTouchEvent *>(event)->touchPoints().count());
+        if (acceptTouchBegin) {
+            event->accept();
+            return true;
+        }
+        break;
+    case QEvent::TouchUpdate:
+        if (!seenTouchBegin) qWarning("TouchUpdate: have not seen TouchBegin");
+        if (seenTouchEnd) qWarning("TouchUpdate: TouchEnd cannot happen before TouchUpdate");
+        seenTouchUpdate = seenTouchBegin && !seenTouchEnd;
+        touchPointCount = qMax(touchPointCount, static_cast<QTouchEvent *>(event)->touchPoints().count());
+        if (acceptTouchUpdate) {
+            event->accept();
+            return true;
+        }
+        break;
+    case QEvent::TouchEnd:
+        if (!seenTouchBegin) qWarning("TouchEnd: have not seen TouchBegin");
+        if (seenTouchEnd) qWarning("TouchEnd: already seen a TouchEnd");
+        seenTouchEnd = seenTouchBegin && !seenTouchEnd;
+        touchPointCount = qMax(touchPointCount, static_cast<QTouchEvent *>(event)->touchPoints().count());
+        if (closeWindowOnTouchEnd)
+            window()->close();
+        if (acceptTouchEnd) {
+            event->accept();
+            return true;
+        }
+        break;
+    case QEvent::MouseButtonPress:
+    case QEvent::MouseButtonDblClick:
+        seenMousePress = true;
+        if (acceptMousePress) {
+            event->accept();
+            return true;
+        }
+        break;
+    case QEvent::MouseMove:
+        seenMouseMove = true;
+        if (acceptMouseMove) {
+            event->accept();
+            return true;
+        }
+        break;
+    case QEvent::MouseButtonRelease:
+        seenMouseRelease = true;
+        if (closeWindowOnMouseRelease)
+            window()->close();        
+        if (acceptMouseRelease) {
+            event->accept();
+            return true;
+        }
+        break;
+    default:
+        break;
+    }
+    return QWidget::event(event);
+}