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

3 files changed, 149 insertions, 6 deletions

diff --git a/tests/auto/qapplication/desktopsettingsaware/main.cpp b/tests/auto/qapplication/desktopsettingsaware/main.cpp
index 9af9319..3374323 100644
--- a/tests/auto/qapplication/desktopsettingsaware/main.cpp
+++ b/tests/auto/qapplication/desktopsettingsaware/main.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -34,7 +34,7 @@
 ** 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 qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/qapplication/tst_qapplication.cpp b/tests/auto/qapplication/tst_qapplication.cpp
index 5e9c237..473d1e7 100644
--- a/tests/auto/qapplication/tst_qapplication.cpp
+++ b/tests/auto/qapplication/tst_qapplication.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -34,7 +34,7 @@
 ** 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 qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -48,6 +48,7 @@
 #include "qabstracteventdispatcher.h"
 #include <QtGui>
 
+#include "private/qapplication_p.h"
 #include "private/qstylesheetstyle_p.h"
 #ifdef Q_OS_WINCE
 #include <windows.h>
@@ -132,6 +133,8 @@ private slots:
 
     void windowsCommandLine_data();
     void windowsCommandLine();
+
+    void touchEventPropagation();
 };
 
 class MyInputContext : public QInputContext
@@ -1817,6 +1820,146 @@ void tst_QApplication::windowsCommandLine()
 #endif
 }
 
+class TouchEventPropagationTestWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    bool seenTouchEvent, acceptTouchEvent, seenMouseEvent, acceptMouseEvent;
+
+    TouchEventPropagationTestWidget(QWidget *parent = 0)
+        : QWidget(parent), seenTouchEvent(false), acceptTouchEvent(false), seenMouseEvent(false), acceptMouseEvent(false)
+    { }
+
+    void reset()
+    {
+        seenTouchEvent = acceptTouchEvent = seenMouseEvent = acceptMouseEvent = false;
+    }
+
+    bool event(QEvent *event)
+    {
+        switch (event->type()) {
+        case QEvent::MouseButtonPress:
+        case QEvent::MouseMove:
+        case QEvent::MouseButtonRelease:
+            // qDebug() << objectName() << "seenMouseEvent = true";
+            seenMouseEvent = true;
+            event->setAccepted(acceptMouseEvent);
+            break;
+        case QEvent::TouchBegin:
+        case QEvent::TouchUpdate:
+        case QEvent::TouchEnd:
+            // qDebug() << objectName() << "seenTouchEvent = true";
+            seenTouchEvent = true;
+            event->setAccepted(acceptTouchEvent);
+            break;
+        default:
+            return QWidget::event(event);
+        }
+        return true;
+    }
+};
+
+void tst_QApplication::touchEventPropagation()
+{
+    int argc = 1;
+    QApplication app(argc, &argv0, QApplication::GuiServer);
+    QTouchEvent::TouchPoint touchPoint(0);
+    QTouchEvent touchEvent(QEvent::TouchBegin, Qt::NoModifier, QList<QTouchEvent::TouchPoint *>() << (&touchPoint));
+
+    {
+        // touch event behavior on a window
+        TouchEventPropagationTestWidget window;
+        window.setObjectName("1. window");
+
+        QApplicationPrivate::sendTouchEvent(&window, &touchEvent);
+        QVERIFY(!window.seenTouchEvent);
+        QVERIFY(window.seenMouseEvent);
+
+        window.reset();
+        window.setAttribute(Qt::WA_AcceptsTouchEvents);
+        QApplicationPrivate::sendTouchEvent(&window, &touchEvent);
+        QVERIFY(window.seenTouchEvent);
+        QVERIFY(window.seenMouseEvent);
+
+        window.reset();
+        window.acceptTouchEvent = true;
+        QApplicationPrivate::sendTouchEvent(&window, &touchEvent);
+        QVERIFY(window.seenTouchEvent);
+        QVERIFY(!window.seenMouseEvent);
+    }
+
+    {
+        // touch event behavior on a window with a child widget
+        TouchEventPropagationTestWidget window;
+        window.setObjectName("2. window");
+        TouchEventPropagationTestWidget widget(&window);
+        widget.setObjectName("2. widget");
+
+        QApplicationPrivate::sendTouchEvent(&widget, &touchEvent);
+        QVERIFY(!widget.seenTouchEvent);
+        QVERIFY(widget.seenMouseEvent);
+        QVERIFY(!window.seenTouchEvent);
+        QVERIFY(window.seenMouseEvent);
+
+        window.reset();
+        widget.reset();
+        widget.setAttribute(Qt::WA_AcceptsTouchEvents);
+        QApplicationPrivate::sendTouchEvent(&widget, &touchEvent);
+        QVERIFY(widget.seenTouchEvent);
+        QVERIFY(widget.seenMouseEvent);
+        QVERIFY(!window.seenTouchEvent);
+        QVERIFY(window.seenMouseEvent);
+
+        window.reset();
+        widget.reset();
+        widget.acceptMouseEvent = true;
+        QApplicationPrivate::sendTouchEvent(&widget, &touchEvent);
+        QVERIFY(widget.seenTouchEvent);
+        QVERIFY(widget.seenMouseEvent);
+        QVERIFY(!window.seenTouchEvent);
+        QVERIFY(!window.seenMouseEvent);
+
+        window.reset();
+        widget.reset();
+        widget.acceptTouchEvent = true;
+        QApplicationPrivate::sendTouchEvent(&widget, &touchEvent);
+        QVERIFY(widget.seenTouchEvent);
+        QVERIFY(!widget.seenMouseEvent);
+        QVERIFY(!window.seenTouchEvent);
+        QVERIFY(!window.seenMouseEvent);
+
+        window.reset();
+        widget.reset();
+        widget.setAttribute(Qt::WA_AcceptsTouchEvents, false);
+        window.setAttribute(Qt::WA_AcceptsTouchEvents);
+        QApplicationPrivate::sendTouchEvent(&widget, &touchEvent);
+        QVERIFY(!widget.seenTouchEvent);
+        QVERIFY(widget.seenMouseEvent);
+        QVERIFY(window.seenTouchEvent);
+        QVERIFY(window.seenMouseEvent);
+
+        window.reset();
+        widget.reset();
+        window.acceptTouchEvent = true;
+        QApplicationPrivate::sendTouchEvent(&widget, &touchEvent);
+        QVERIFY(!widget.seenTouchEvent);
+        QVERIFY(!widget.seenMouseEvent);
+        QVERIFY(window.seenTouchEvent);
+        QVERIFY(!window.seenMouseEvent);
+
+        window.reset();
+        widget.reset();
+        widget.acceptMouseEvent = true; // doesn't matter, touch events are propagated first
+        window.acceptTouchEvent = true;
+        QApplicationPrivate::sendTouchEvent(&widget, &touchEvent);
+        QVERIFY(!widget.seenTouchEvent);
+        QVERIFY(!widget.seenMouseEvent);
+        QVERIFY(window.seenTouchEvent);
+        QVERIFY(!window.seenMouseEvent);
+    }
+}
+
 //QTEST_APPLESS_MAIN(tst_QApplication)
 int main(int argc, char *argv[])
 {
diff --git a/tests/auto/qapplication/wincmdline/main.cpp b/tests/auto/qapplication/wincmdline/main.cpp
index e54f2d9..c30e867 100644
--- a/tests/auto/qapplication/wincmdline/main.cpp
+++ b/tests/auto/qapplication/wincmdline/main.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -34,7 +34,7 @@
 ** 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 qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/