From aaa46d829b83eaaf276fdd68921c4dd4d4dd5d2a Mon Sep 17 00:00:00 2001
From: Jedrzej Nowacki <jedrzej.nowacki@nokia.com>
Date: Tue, 24 Nov 2009 16:21:17 +0200
Subject: The functionEntryAndExit_builtin autotest was enriched by a new
 dataset.

The new dataset was created. In the function we shouldn't test only one
data type. In the same time a new Jira's task were created (QTBUG-6187)
as a result of the XFail investigation.

Reviewed-by: TrustMe
---
 .../qscriptengineagent/tst_qscriptengineagent.cpp  | 38 ++++++++++++++++++----
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
index b061eb2..1a02785 100644
--- a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
+++ b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
@@ -85,6 +85,7 @@ private slots:
     void functionEntryAndExit_native();
     void functionEntryAndExit_native2();
     void functionEntryAndExit_nativeThrowing();
+    void functionEntryAndExit_builtin_data();
     void functionEntryAndExit_builtin();
     void functionEntryAndExit_objects();
     void functionEntryAndExit_slots();
@@ -811,18 +812,42 @@ void tst_QScriptEngineAgent::functionEntryAndExit_nativeThrowing()
     delete spy;
 }
 
+void tst_QScriptEngineAgent::functionEntryAndExit_builtin_data()
+{
+  QTest::addColumn<QString>("script");
+  QTest::addColumn<QString>("result");
+
+  QTest::newRow("string native") << "'ciao'.toString()" << "ciao";
+  QTest::newRow("string object") << "String('ciao').toString()" << "ciao";
+  QTest::newRow("number native") << "(123).toString()" << "123";
+  QTest::newRow("number object") << "Number(123).toString()" << "123";
+  QTest::newRow("array native") << "['s','a'].toString()" << "s, a";
+  QTest::newRow("array object") << "Array('s', 'a').toString()" << "s,a";
+  QTest::newRow("boolean native") << "false.toString()" << "false";
+  QTest::newRow("boolean object") << "Boolean(true).toString()" << "true";
+  QTest::newRow("regexp native") << "/a/.toString()" << "/a/";
+  QTest::newRow("regexp object") << "RegExp('a').toString()" << "/a/";
+}
+
 /** check behaiviour of built-in function */
 void tst_QScriptEngineAgent::functionEntryAndExit_builtin()
 {
+    QFETCH(QString, script);
+    QFETCH(QString, result);
     QScriptEngine eng;
     ScriptEngineSpy *spy = new ScriptEngineSpy(&eng, ~(ScriptEngineSpy::IgnoreFunctionEntry
                                                        | ScriptEngineSpy::IgnoreFunctionExit));
     {
         spy->clear();
-        eng.evaluate("'ciao'.toString()");
-
-        if (qt_script_isJITEnabled())
-            QEXPECT_FAIL("", "Some events are missing when JIT is enabled", Abort);
+        eng.evaluate(script);
+
+        if (qt_script_isJITEnabled()) {
+            QEXPECT_FAIL("string native", "QTBUG-6187 Some events are missing when JIT is enabled", Abort);
+            QEXPECT_FAIL("number native", "QTBUG-6187 Some events are missing when JIT is enabled", Abort);
+            QEXPECT_FAIL("array native", "QTBUG-6187 Some events are missing when JIT is enabled", Abort);
+            QEXPECT_FAIL("boolean native", "QTBUG-6187 Some events are missing when JIT is enabled", Abort);
+            QEXPECT_FAIL("regexp native", "QTBUG-6187 Some events are missing when JIT is enabled", Abort);
+        }
         QCOMPARE(spy->count(), 4);
 
         // evaluate() entry
@@ -835,14 +860,13 @@ void tst_QScriptEngineAgent::functionEntryAndExit_builtin()
         // built-in native function exit
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::FunctionExit);
         QCOMPARE(spy->at(2).scriptId, qint64(-1));
-        QVERIFY(spy->at(2).value.isString());
-        QCOMPARE(spy->at(2).value.toString(), QString("ciao"));
+        QCOMPARE(spy->at(2).value.toString(), QString(result));
 
         // evaluate() exit
         QCOMPARE(spy->at(3).type, ScriptEngineEvent::FunctionExit);
         QCOMPARE(spy->at(3).scriptId, spy->at(0).scriptId);
         QVERIFY(spy->at(3).value.isString());
-        QCOMPARE(spy->at(3).value.toString(), QString("ciao"));
+        QCOMPARE(spy->at(3).value.toString(), QString(result));
     }
     delete spy;
 }
-- 
cgit v0.12


From 76f61c87fcdaabef668babb79e3da2fe87c1d9cc Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Thu, 19 Nov 2009 12:01:17 +0100
Subject: Revert "Revert "Stop using the NameOwnerChanged signal without arg0
 in QtDBus itself""

This reverts commit db1cff73726ff12d50139769dc8071f9e9173261.

Task-number: QTBUG-5979
---
 src/dbus/qdbusconnection.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index d3aff6d..d7088ff 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -1005,9 +1005,6 @@ void QDBusConnectionPrivate::setBusService(const QDBusConnection &connection)
     busService = new QDBusConnectionInterface(connection, this);
     ref.deref(); // busService has increased the refcounting to us
                  // avoid cyclic refcounting
-//    if (mode != PeerMode)
-    QObject::connect(busService, SIGNAL(serviceOwnerChanged(QString,QString,QString)),
-                     this, SIGNAL(serviceOwnerChanged(QString,QString,QString)));
 
     QObject::connect(this, SIGNAL(callWithCallbackFailed(QDBusError,QDBusMessage)),
                      busService, SIGNAL(callWithCallbackFailed(QDBusError,QDBusMessage)),
-- 
cgit v0.12


From 70d0d80e5cc11f98778234ddd20ce668551e9d9d Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Thu, 19 Nov 2009 13:20:47 +0100
Subject: Revert "Disable the deprecation warning for this signal since we're
 using it now"

This reverts commit f01c631f84f9373b06d0572bfed7a4e8213a46a7.
---
 src/dbus/qdbusconnectioninterface.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/dbus/qdbusconnectioninterface.cpp b/src/dbus/qdbusconnectioninterface.cpp
index 3b38432..414d318 100644
--- a/src/dbus/qdbusconnectioninterface.cpp
+++ b/src/dbus/qdbusconnectioninterface.cpp
@@ -337,6 +337,11 @@ void QDBusConnectionInterface::connectNotify(const char *signalName)
         QDBusAbstractInterface::connectNotify(SIGNAL(NameLost(QString)));
 
     else if (qstrcmp(signalName, SIGNAL(serviceOwnerChanged(QString,QString,QString))) == 0) {
+        static bool warningPrinted = false;
+        if (!warningPrinted) {
+            qWarning("Connecting to deprecated signal QDBusConnectionInterface::serviceOwnerChanged(QString,QString,QString)");
+            warningPrinted = true;
+        }
         QDBusAbstractInterface::connectNotify(SIGNAL(NameOwnerChanged(QString,QString,QString)));
     }
 }
-- 
cgit v0.12


From 8a820c790f2316052819148e344a3cd197877433 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Thu, 19 Nov 2009 13:21:04 +0100
Subject: Fix the detection of when this process gets names on the bus.

Previously, we were relying on NameOwnerChanged to notify us of our
own names. This worked because we got all NameOwnerChanged that
happened on the bus.

Now, we only get those we're interested in. Instead of watching for
newOwner==baseService, let's just use the NameAcquired and NameLost
signals, that the D-Bus server sends to us anyway.

Task-number: QTBUG-5979
---
 src/dbus/qdbusconnection_p.h                       |  5 +-
 src/dbus/qdbusintegrator.cpp                       | 18 +++---
 tests/auto/qdbusconnection/tst_qdbusconnection.cpp | 66 ++++++++++++++++++++++
 3 files changed, 77 insertions(+), 12 deletions(-)

diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h
index 830dac3..b65e101 100644
--- a/src/dbus/qdbusconnection_p.h
+++ b/src/dbus/qdbusconnection_p.h
@@ -199,9 +199,6 @@ public:
     QDBusMetaObject *findMetaObject(const QString &service, const QString &path,
                                     const QString &interface, QDBusError &error);
 
-    void registerService(const QString &serviceName);
-    void unregisterService(const QString &serviceName);
-
     void postEventToThread(int action, QObject *target, QEvent *event);
 
     inline void serverConnection(const QDBusConnection &connection)
@@ -238,6 +235,8 @@ public slots:
     void objectDestroyed(QObject *o);
     void relaySignal(QObject *obj, const QMetaObject *, int signalId, const QVariantList &args);
     void _q_serviceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner);
+    void registerService(const QString &serviceName);
+    void unregisterService(const QString &serviceName);
 
 signals:
     void serviceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner);
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 870ddd0..40febc4 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -948,9 +948,6 @@ QDBusConnectionPrivate::QDBusConnectionPrivate(QObject *p)
 
     rootNode.flags = 0;
     watchedServiceNames[QLatin1String(DBUS_SERVICE_DBUS)] = 1;
-
-    connect(this, SIGNAL(serviceOwnerChanged(QString,QString,QString)),
-            this, SLOT(_q_serviceOwnerChanged(QString,QString,QString)));
 }
 
 QDBusConnectionPrivate::~QDBusConnectionPrivate()
@@ -1180,11 +1177,7 @@ void QDBusConnectionPrivate::relaySignal(QObject *obj, const QMetaObject *mo, in
 void QDBusConnectionPrivate::_q_serviceOwnerChanged(const QString &name,
                                                     const QString &oldOwner, const QString &newOwner)
 {
-    if (oldOwner == baseService)
-        unregisterService(name);
-    if (newOwner == baseService)
-        registerService(name);
-
+    Q_UNUSED(oldOwner);
     QDBusWriteLocker locker(UpdateSignalHookOwnerAction, this);
     QMutableHashIterator<QString, SignalHook> it(signalHooks);
     it.toFront();
@@ -1655,9 +1648,16 @@ void QDBusConnectionPrivate::setConnection(DBusConnection *dbc, const QDBusError
 
         baseService = QString::fromUtf8(service);
     } else {
-        qWarning("QDBusConnectionPrivate::SetConnection: Unable to get base service");
+        qWarning("QDBusConnectionPrivate::setConnection: Unable to get base service");
     }
 
+    QString busService = QLatin1String(DBUS_SERVICE_DBUS);
+    connectSignal(busService, QString(), QString(), QString(), QLatin1String("NameAcquired"), QStringList(), QString(),
+                  this, SLOT(registerService(QString)));
+    connectSignal(busService, QString(), QString(), QString(), QLatin1String("NameLost"), QStringList(), QString(),
+                  this, SLOT(unregisterService(QString)));
+
+
     q_dbus_connection_add_filter(connection, qDBusSignalFilter, this, 0);
 
     //qDebug("base service: %s", service);
diff --git a/tests/auto/qdbusconnection/tst_qdbusconnection.cpp b/tests/auto/qdbusconnection/tst_qdbusconnection.cpp
index bb034a3..c1976c0 100644
--- a/tests/auto/qdbusconnection/tst_qdbusconnection.cpp
+++ b/tests/auto/qdbusconnection/tst_qdbusconnection.cpp
@@ -96,6 +96,8 @@ private slots:
     void registerQObjectChildren();
 
     void callSelf();
+    void callSelfByAnotherName_data();
+    void callSelfByAnotherName();
     void multipleInterfacesInQObject();
 
     void slotsWithLessParameters();
@@ -493,6 +495,70 @@ void tst_QDBusConnection::callSelf()
     QCOMPARE(reply.arguments().value(0).toInt(), 45);
 }
 
+void tst_QDBusConnection::callSelfByAnotherName_data()
+{
+    QTest::addColumn<int>("registerMethod");
+    QTest::newRow("connection") << 0;
+    QTest::newRow("connection-interface") << 1;
+    QTest::newRow("direct") << 2;
+}
+
+void tst_QDBusConnection::callSelfByAnotherName()
+{
+    static int counter = 0;
+    QString sname = serviceName() + QString::number(counter++);
+
+    QDBusConnection con = QDBusConnection::sessionBus();
+    QVERIFY(con.isConnected());
+
+    TestObject testObject;
+    QVERIFY(con.registerObject("/test", &testObject,
+            QDBusConnection::ExportAllContents));
+    con.connect("org.freedesktop.DBus", "/org/freedesktop/DBus", "org.freedesktop.DBus", "NameOwnerChanged",
+                QStringList() << sname << "",
+                QString(), &QTestEventLoop::instance(), SLOT(exitLoop()));
+
+    // register the name
+    QFETCH(int, registerMethod);
+    switch (registerMethod) {
+    case 0:
+        QVERIFY(con.registerService(sname));
+        break;
+
+    case 1:
+        QVERIFY(con.interface()->registerService(sname).value() == QDBusConnectionInterface::ServiceRegistered);
+        break;
+
+    case 2: {
+            // flag is DBUS_NAME_FLAG_DO_NOT_QUEUE = 0x04
+            // reply is DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER = 1
+            QDBusReply<uint> reply = con.interface()->call("RequestName", sname, 4u);
+            QVERIFY(reply.value() == 1);
+        }
+    }
+
+    struct Deregisterer {
+        QDBusConnection con;
+        QString sname;
+        Deregisterer(const QDBusConnection &con, const QString &sname) : con(con), sname(sname) {}
+        ~Deregisterer() { con.interface()->unregisterService(sname); }
+    } deregisterer(con, sname);
+
+    // give the connection a chance to find out that we're good to go
+    QTestEventLoop::instance().enterLoop(2);
+    con.disconnect("org.freedesktop.DBus", "/org/freedesktop/DBus", "org.freedesktop.DBus", "NameOwnerChanged",
+                 QStringList() << sname << "",
+                 QString(), &QTestEventLoop::instance(), SLOT(exitLoop()));
+    QVERIFY(!QTestEventLoop::instance().timeout());
+
+    // make the call
+    QDBusMessage msg = QDBusMessage::createMethodCall(sname, "/test",
+                                                      QString(), "test0");
+    QDBusMessage reply = con.call(msg, QDBus::Block, 1000);
+
+    QVERIFY(reply.type() == QDBusMessage::ReplyMessage);
+}
+
 void tst_QDBusConnection::multipleInterfacesInQObject()
 {
     QDBusConnection con = QDBusConnection::sessionBus();
-- 
cgit v0.12


From ad9a9657d2244e42b730482d8089ea7431f31773 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Thu, 19 Nov 2009 13:43:19 +0100
Subject: Doc: Update the documentation for the serviceOwnerChanged signal.

Add the note that this signal will cause many activations and that
QDBusServiceWatcher is better.
---
 src/dbus/qdbusconnectioninterface.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/dbus/qdbusconnectioninterface.cpp b/src/dbus/qdbusconnectioninterface.cpp
index 414d318..0f9a67f 100644
--- a/src/dbus/qdbusconnectioninterface.cpp
+++ b/src/dbus/qdbusconnectioninterface.cpp
@@ -394,6 +394,12 @@ void QDBusConnectionInterface::disconnectNotify(const char *signalName)
     empty string, it means the name \a name has just been created; if
     \a newOwner is empty, the name \a name has no current owner and is
     no longer available.
+
+    \note connecting to this signal will make the application listen for and
+    receive every single service ownership change on the bus. Depending on
+    how many services are running, this make the application be activated to
+    receive more signals than it needs. To avoid this problem, use the
+    QDBusServiceWatcher class, which can listen for specific changes.
 */
 
 /*!
-- 
cgit v0.12


From ad87a761207ac1155c55773270bb6583677ccd30 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Thu, 19 Nov 2009 13:44:10 +0100
Subject: Small performance improvement: don't match the bus path.

We trust the bus, so no need to match per path. The sender and the
interface should be enough for us.
---
 src/dbus/qdbusservicewatcher.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/dbus/qdbusservicewatcher.cpp b/src/dbus/qdbusservicewatcher.cpp
index 1557b47..4328558 100644
--- a/src/dbus/qdbusservicewatcher.cpp
+++ b/src/dbus/qdbusservicewatcher.cpp
@@ -50,7 +50,6 @@
 QT_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC_WITH_ARGS(QString, busService, (QLatin1String(DBUS_SERVICE_DBUS)))
-Q_GLOBAL_STATIC_WITH_ARGS(QString, busPath, (QLatin1String(DBUS_PATH_DBUS)))
 Q_GLOBAL_STATIC_WITH_ARGS(QString, busInterface, (QLatin1String(DBUS_INTERFACE_DBUS)))
 Q_GLOBAL_STATIC_WITH_ARGS(QString, signalName, (QLatin1String("NameOwnerChanged")))
 
@@ -127,7 +126,7 @@ QStringList QDBusServiceWatcherPrivate::matchArgsForService(const QString &servi
 void QDBusServiceWatcherPrivate::addService(const QString &service)
 {
     QStringList matchArgs = matchArgsForService(service);
-    connection.connect(*busService(), *busPath(), *busInterface(), *signalName(),
+    connection.connect(*busService(), QString(), *busInterface(), *signalName(),
                        matchArgs, QString(), q_func(),
                        SLOT(_q_serviceOwnerChanged(QString,QString,QString)));
 }
@@ -135,7 +134,7 @@ void QDBusServiceWatcherPrivate::addService(const QString &service)
 void QDBusServiceWatcherPrivate::removeService(const QString &service)
 {
     QStringList matchArgs = matchArgsForService(service);
-    connection.disconnect(*busService(), *busPath(), *busInterface(), *signalName(),
+    connection.disconnect(*busService(), QString(), *busInterface(), *signalName(),
                           matchArgs, QString(), q_func(),
                           SLOT(_q_serviceOwnerChanged(QString,QString,QString)));
 }
-- 
cgit v0.12


From 80e9b7cdeeb1b1e85e724b4ed1903e0923005c79 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Wed, 25 Nov 2009 10:16:26 +1000
Subject: Fix links to docs in INSTALL and README

The names of the doc directories on the doc site don't include the patch
version number.

Task-number: QTBUG-6043
Reviewed-by: Trust Me
---
 INSTALL     | 14 +++++++-------
 dist/README |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/INSTALL b/INSTALL
index b62f21d..7279f06 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,14 +1,14 @@
         INSTALLING Qt Source Package Version %VERSION%.
 
 For full installation instructions for each supported platform, please
-see http://qt.nokia.com/doc/%VERSION%/installation.html, the file 
+see http://qt.nokia.com/doc/%SHORTVERSION%/installation.html, the file 
 doc/html/installation.html in this package, or follow one of the following
 links:
 
-Embedded Linux:   http://qt.nokia.com/doc/%VERSION%/qt-embedded-install.html
-Mac OS X:         http://qt.nokia.com/doc/%VERSION%/install-mac.html
-Windows:          http://qt.nokia.com/doc/%VERSION%/install-win.html
-Windows CE:       http://qt.nokia.com/doc/%VERSION%/install-wince.html
-X11 Platforms:    http://qt.nokia.com/doc/%VERSION%/install-x11.html
-Symbian Platform: http://qt.nokia.com/doc/%VERSION%/install-symbian.html
+Embedded Linux:   http://qt.nokia.com/doc/%SHORTVERSION%/qt-embedded-install.html
+Mac OS X:         http://qt.nokia.com/doc/%SHORTVERSION%/install-mac.html
+Windows:          http://qt.nokia.com/doc/%SHORTVERSION%/install-win.html
+Windows CE:       http://qt.nokia.com/doc/%SHORTVERSION%/install-wince.html
+X11 Platforms:    http://qt.nokia.com/doc/%SHORTVERSION%/install-x11.html
+Symbian Platform: http://qt.nokia.com/doc/%SHORTVERSION%/install-symbian.html
 
diff --git a/dist/README b/dist/README
index 529d2bd..e7dfb19 100644
--- a/dist/README
+++ b/dist/README
@@ -52,7 +52,7 @@ documentation is available at http://qt.nokia.com/doc/.
 SUPPORTED PLATFORMS
 
 For a complete list of supported platforms, see
-http://qt.nokia.com/doc/%VERSION%/supported-platforms.html.
+http://qt.nokia.com/doc/%SHORTVERSION%/supported-platforms.html.
 
 
 COMMERCIAL EDITIONS
@@ -65,7 +65,7 @@ the QtCore, QtGui (except QGraphicsView), QtTest, QtDBus and
 Qt3Support modules.
 
 For a full listing of the contents of each module, please refer to 
-http://qt.nokia.com/doc/%VERSION%/modules.html
+http://qt.nokia.com/doc/%SHORTVERSION%/modules.html
 
 
 HOW TO REPORT A BUG
-- 
cgit v0.12


From c71c46430317b70e784f0952d0aac048775ad842 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Tue, 24 Nov 2009 09:34:48 +0100
Subject: Fix QFile::map in Linux 64bit

On 64bit, qint64(size_t(-1)) = -1

Reviewed-by: Joao
Reviewed-by: Thiago
(cherry picked from commit 829d9e10ad3d26fb2fddef01c8e36352018c3fec)
---
 src/corelib/io/qfsfileengine_unix.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 35737b3..8cbf6a3 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -1245,7 +1245,7 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFla
     }
 
     if (offset < 0 || offset != qint64(QT_OFF_T(offset))
-            || size < 0 || size > qint64(size_t(-1))) {
+            || size < 0 || quint64(size) > quint64(size_t(-1))) {
         q->setError(QFile::UnspecifiedError, qt_error_string(int(EINVAL)));
         return 0;
     }
-- 
cgit v0.12


From 106121a74bca32a6411b9ca968ee415f8bdfbff1 Mon Sep 17 00:00:00 2001
From: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Date: Mon, 23 Nov 2009 17:56:03 +0100
Subject: Fixes implicit grabbing in Qt/Cocoa

When delivering mouse events in Qt/Cocoa set the implicit mouse grabber and
deliver the event to it and do not try to propagate the event to the parent
view.

Reviewed-by: Prasanth
(cherry picked from commit aae81f370f6afede95064bc75eb7ee6ac13b1c30)
---
 src/gui/kernel/qcocoaview_mac.mm       | 51 ++++++++++++++--------------------
 src/gui/kernel/qt_cocoa_helpers_mac.mm |  8 ++++++
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index 72eedad..bf6bf4a 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -79,6 +79,7 @@ extern bool qt_sendSpontaneousEvent(QObject *, QEvent *); // qapplication.cpp
 extern OSViewRef qt_mac_nativeview_for(const QWidget *w); // qwidget_mac.mm
 extern const QStringList& qEnabledDraggedTypes(); // qmime_mac.cpp
 extern QPointer<QWidget> qt_mouseover; //qapplication_mac.mm
+extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp
 
 Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum)
 {
@@ -691,6 +692,9 @@ extern "C" {
 
 - (void)mouseDown:(NSEvent *)theEvent
 {
+    if (!qt_button_down)
+        qt_button_down = qwidget;
+
     qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, Qt::LeftButton);
     // Don't call super here. This prevents us from getting the mouseUp event,
     // which we need to send even if the mouseDown event was not accepted.
@@ -700,75 +704,62 @@ extern "C" {
 
 - (void)mouseUp:(NSEvent *)theEvent
 {
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonRelease, Qt::LeftButton);
+    qt_button_down = 0;
 
-    if (!mouseOK)
-        [super mouseUp:theEvent];
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonRelease, Qt::LeftButton);
 }
 
 - (void)rightMouseDown:(NSEvent *)theEvent
 {
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, Qt::RightButton);
+    if (!qt_button_down)
+        qt_button_down = qwidget;
 
-    if (!mouseOK)
-        [super rightMouseDown:theEvent];
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, Qt::RightButton);
 }
 
 - (void)rightMouseUp:(NSEvent *)theEvent
 {
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonRelease, Qt::RightButton);
+    qt_button_down = 0;
 
-    if (!mouseOK)
-        [super rightMouseUp:theEvent];
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonRelease, Qt::RightButton);
 }
 
 - (void)otherMouseDown:(NSEvent *)theEvent
 {
-    Qt::MouseButton mouseButton = cocoaButton2QtButton([theEvent buttonNumber]);
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, mouseButton);
+    if (!qt_button_down)
+        qt_button_down = qwidget;
 
-    if (!mouseOK)
-        [super otherMouseDown:theEvent];
+    Qt::MouseButton mouseButton = cocoaButton2QtButton([theEvent buttonNumber]);
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, mouseButton);
 }
 
 - (void)otherMouseUp:(NSEvent *)theEvent
 {
-    Qt::MouseButton mouseButton = cocoaButton2QtButton([theEvent buttonNumber]);
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent,  QEvent::MouseButtonRelease, mouseButton);
-
-    if (!mouseOK)
-        [super otherMouseUp:theEvent];
+    qt_button_down = 0;
 
+    Qt::MouseButton mouseButton = cocoaButton2QtButton([theEvent buttonNumber]);
+    qt_mac_handleMouseEvent(self, theEvent,  QEvent::MouseButtonRelease, mouseButton);
 }
 
 - (void)mouseDragged:(NSEvent *)theEvent
 {
     qMacDnDParams()->view = self;
     qMacDnDParams()->theEvent = theEvent;
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
-
-    if (!mouseOK)
-        [super mouseDragged:theEvent];
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
 }
 
 - (void)rightMouseDragged:(NSEvent *)theEvent
 {
     qMacDnDParams()->view = self;
     qMacDnDParams()->theEvent = theEvent;
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
-
-    if (!mouseOK)
-        [super rightMouseDragged:theEvent];
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
 }
 
 - (void)otherMouseDragged:(NSEvent *)theEvent
 {
     qMacDnDParams()->view = self;
     qMacDnDParams()->theEvent = theEvent;
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
-
-    if (!mouseOK)
-        [super otherMouseDragged:theEvent];
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
 }
 
 - (void)scrollWheel:(NSEvent *)theEvent
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm
index c0fb8aa..2bf1465 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
+++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm
@@ -899,6 +899,14 @@ bool qt_mac_handleMouseEvent(void * /* NSView * */view, void * /* NSEvent * */ev
             widgetToGetMouse =
                 [static_cast<QT_MANGLE_NAMESPACE(QCocoaView) *>(tmpView) qt_qwidget];
         }
+    } else {
+        extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp
+        if (!mac_mouse_grabber && qt_button_down) {
+            // if there is no explicit grabber, and the mouse was grabbed
+            // implicitely (i.e. a mousebutton was pressed)
+            widgetToGetMouse = qt_button_down;
+            tmpView = qt_mac_nativeview_for(widgetToGetMouse);
+        }
     }
 
     NSPoint localPoint = [tmpView convertPoint:windowPoint fromView:nil];
-- 
cgit v0.12


From 6cb0ac70301a21e914cb5716642c756312b3ec30 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Wed, 25 Nov 2009 10:30:52 +0100
Subject: Network auto tests: Some timeout increases

Reviewed-by: TrustMe
---
 tests/auto/networkselftest/tst_networkselftest.cpp | 4 ++--
 tests/auto/qftp/tst_qftp.cpp                       | 2 +-
 tests/auto/qlocalsocket/tst_qlocalsocket.cpp       | 4 ++--
 tests/auto/qnetworkreply/tst_qnetworkreply.cpp     | 2 +-
 tests/auto/qudpsocket/tst_qudpsocket.cpp           | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/auto/networkselftest/tst_networkselftest.cpp b/tests/auto/networkselftest/tst_networkselftest.cpp
index f13bcad..b9be5cb 100644
--- a/tests/auto/networkselftest/tst_networkselftest.cpp
+++ b/tests/auto/networkselftest/tst_networkselftest.cpp
@@ -156,7 +156,7 @@ static QString prettyByteArray(const QByteArray &array)
     return result;
 }
 
-static bool doSocketRead(QTcpSocket *socket, int minBytesAvailable, int timeout = 2000)
+static bool doSocketRead(QTcpSocket *socket, int minBytesAvailable, int timeout = 4000)
 {
     QTime timer;
     timer.start();
@@ -171,7 +171,7 @@ static bool doSocketRead(QTcpSocket *socket, int minBytesAvailable, int timeout
     }
 }
 
-static bool doSocketFlush(QTcpSocket *socket, int timeout = 2000)
+static bool doSocketFlush(QTcpSocket *socket, int timeout = 4000)
 {
 #ifndef QT_NO_OPENSSL
     QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);
diff --git a/tests/auto/qftp/tst_qftp.cpp b/tests/auto/qftp/tst_qftp.cpp
index 263c957..27c2e13 100644
--- a/tests/auto/qftp/tst_qftp.cpp
+++ b/tests/auto/qftp/tst_qftp.cpp
@@ -1408,7 +1408,7 @@ void tst_QFtp::bytesAvailable()
     if ( type != 0 )
         addCommand( QFtp::Close, ftp->close() );
 
-    QTestEventLoop::instance().enterLoop( 30 );
+    QTestEventLoop::instance().enterLoop( 40 );
     if ( QTestEventLoop::instance().timeout() )
         QFAIL( "Network operation timed out" );
 
diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
index 5ead049..8cabadb 100644
--- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
@@ -695,7 +695,7 @@ public:
                   || socket.error() == QLocalSocket::ConnectionRefusedError)
              && tries < 1000);
         if (tries == 0 && socket.state() != QLocalSocket::ConnectedState) {
-            QVERIFY(socket.waitForConnected(3000));
+            QVERIFY(socket.waitForConnected(7000));
             QVERIFY(socket.state() == QLocalSocket::ConnectedState);
         }
 
@@ -725,7 +725,7 @@ public:
         int done = clients;
         while (done > 0) {
             bool timedOut = true;
-            QVERIFY(server.waitForNewConnection(3000, &timedOut));
+            QVERIFY(server.waitForNewConnection(7000, &timedOut));
             QVERIFY(!timedOut);
             QLocalSocket *serverSocket = server.nextPendingConnection();
             QVERIFY(serverSocket);
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index 09456ed..5fe716a 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -2212,7 +2212,7 @@ void tst_QNetworkReply::ioGetWithManyProxies()
     connect(&manager, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
             SLOT(sslErrors(QNetworkReply*,QList<QSslError>)));
 #endif
-    QTestEventLoop::instance().enterLoop(10);
+    QTestEventLoop::instance().enterLoop(15);
     QVERIFY(!QTestEventLoop::instance().timeout());
 
     manager.disconnect(SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
diff --git a/tests/auto/qudpsocket/tst_qudpsocket.cpp b/tests/auto/qudpsocket/tst_qudpsocket.cpp
index 9418be0..160d74c 100644
--- a/tests/auto/qudpsocket/tst_qudpsocket.cpp
+++ b/tests/auto/qudpsocket/tst_qudpsocket.cpp
@@ -295,8 +295,8 @@ void tst_QUdpSocket::loop()
     QCOMPARE(paul.writeDatagram(paulMessage.data(), paulMessage.length(),
                                peterAddress, peter.localPort()), qint64(paulMessage.length()));
 
-    QVERIFY(peter.waitForReadyRead(5000));
-    QVERIFY(paul.waitForReadyRead(5000));
+    QVERIFY(peter.waitForReadyRead(9000));
+    QVERIFY(paul.waitForReadyRead(9000));
     char peterBuffer[16*1024];
     char paulBuffer[16*1024];
     if (success) {
-- 
cgit v0.12


From c6eee578665bfd2c3b25b238cf8ae24fee00f9f7 Mon Sep 17 00:00:00 2001
From: Jakub Wieczorek <faw217@gmail.com>
Date: Mon, 26 Oct 2009 22:23:28 +0100
Subject: QXmlStream: Fix parsing of DTDs that contain empty markup
 declarations

like e.g. <!DOCTYPE doc []>

According to the specification, it is possible for a doctype to contain
no markup declarations:
http://www.w3.org/TR/xml/#sec-prolog-dtd

"intSubset ::= (markupdecl | DeclSep)*"

However, currently QXmlStreamReader would raise an error when
encountering such a declaration.

Merge-request: 1926
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
---
 src/corelib/xml/qxmlstream.g                          | 1 +
 tests/auto/qxmlstream/data/doctypeEmptyMarkupDecl.ref | 7 +++++++
 tests/auto/qxmlstream/data/doctypeEmptyMarkupDecl.xml | 3 +++
 3 files changed, 11 insertions(+)
 create mode 100644 tests/auto/qxmlstream/data/doctypeEmptyMarkupDecl.ref
 create mode 100644 tests/auto/qxmlstream/data/doctypeEmptyMarkupDecl.xml

diff --git a/src/corelib/xml/qxmlstream.g b/src/corelib/xml/qxmlstream.g
index 22ba33d..9921d41 100644
--- a/src/corelib/xml/qxmlstream.g
+++ b/src/corelib/xml/qxmlstream.g
@@ -915,6 +915,7 @@ markup ::= markup_start markup_list RBRACK;
 
 markup_list ::= markup_decl | space | pereference;
 markup_list ::= markup_list markup_decl | markup_list space | markup_list pereference;
+markup_list ::=;
 
 markup_decl ::= element_decl | attlist_decl | entity_decl | entity_done | notation_decl | processing_instruction | comment;
 
diff --git a/tests/auto/qxmlstream/data/doctypeEmptyMarkupDecl.ref b/tests/auto/qxmlstream/data/doctypeEmptyMarkupDecl.ref
new file mode 100644
index 0000000..ea85e32
--- /dev/null
+++ b/tests/auto/qxmlstream/data/doctypeEmptyMarkupDecl.ref
@@ -0,0 +1,7 @@
+StartDocument( )
+Comment( text=" Empty markup declaration in a doctype. " )
+DTD( text="
+<!DOCTYPE doc []>" dtdName="doc" )
+StartElement( name="doc" qualifiedName="doc" )
+EndElement( name="doc" qualifiedName="doc" )
+EndDocument( )
diff --git a/tests/auto/qxmlstream/data/doctypeEmptyMarkupDecl.xml b/tests/auto/qxmlstream/data/doctypeEmptyMarkupDecl.xml
new file mode 100644
index 0000000..1c66c0c
--- /dev/null
+++ b/tests/auto/qxmlstream/data/doctypeEmptyMarkupDecl.xml
@@ -0,0 +1,3 @@
+<!-- Empty markup declaration in a doctype. -->
+<!DOCTYPE doc []>
+<doc></doc>
-- 
cgit v0.12


From 82657e28ebe0ed5b1d60b2a18ac4af145f5c4c46 Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter.hartmann@nokia.com>
Date: Wed, 25 Nov 2009 10:19:21 +0100
Subject: QXmlStream: regenerate header after grammar change

the grammar file src/corelib/xml/qxmlstream.g has been changed in the
previous commit, this commit regenerates the file
src/corelib/xml/qxmlstream_p.h .

Reviewed-by: TrustMe
---
 src/corelib/xml/qxmlstream_p.h | 323 +++++++++++++++++++++--------------------
 1 file changed, 162 insertions(+), 161 deletions(-)

diff --git a/src/corelib/xml/qxmlstream_p.h b/src/corelib/xml/qxmlstream_p.h
index 253f8bd..5eea065 100644
--- a/src/corelib/xml/qxmlstream_p.h
+++ b/src/corelib/xml/qxmlstream_p.h
@@ -121,7 +121,7 @@ public:
     XML = 54,
 
     ACCEPT_STATE = 416,
-    RULE_COUNT = 269,
+    RULE_COUNT = 270,
     STATE_COUNT = 427,
     TERMINAL_COUNT = 57,
     NON_TERMINAL_COUNT = 84,
@@ -172,105 +172,105 @@ const char *const QXmlStreamReader_Table::spell [] = {
 const short QXmlStreamReader_Table::lhs [] = {
   57, 57, 59, 59, 59, 59, 59, 59, 59, 59, 
   67, 68, 64, 72, 72, 72, 75, 66, 66, 66, 
-  66, 79, 78, 80, 80, 80, 80, 80, 80, 81, 
-  81, 81, 81, 81, 81, 81, 87, 83, 88, 88, 
-  88, 88, 91, 92, 93, 93, 93, 93, 94, 94, 
-  96, 96, 96, 97, 97, 98, 98, 99, 99, 100, 
-  100, 89, 89, 95, 90, 101, 101, 103, 103, 103, 
-  103, 103, 103, 103, 103, 103, 103, 104, 105, 105, 
-  105, 105, 107, 108, 109, 109, 84, 84, 110, 110, 
-  112, 112, 85, 85, 85, 65, 65, 76, 114, 63, 
-  115, 116, 86, 86, 86, 117, 117, 117, 117, 117, 
+  66, 79, 78, 80, 80, 80, 80, 80, 80, 80, 
+  81, 81, 81, 81, 81, 81, 81, 87, 83, 88, 
+  88, 88, 88, 91, 92, 93, 93, 93, 93, 94, 
+  94, 96, 96, 96, 97, 97, 98, 98, 99, 99, 
+  100, 100, 89, 89, 95, 90, 101, 101, 103, 103, 
+  103, 103, 103, 103, 103, 103, 103, 103, 104, 105, 
+  105, 105, 105, 107, 108, 109, 109, 84, 84, 110, 
+  110, 112, 112, 85, 85, 85, 65, 65, 76, 114, 
+  63, 115, 116, 86, 86, 86, 117, 117, 117, 117, 
   117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 
-  117, 117, 117, 117, 117, 117, 117, 117, 118, 118, 
-  119, 119, 119, 119, 119, 119, 119, 119, 122, 70, 
-  70, 70, 70, 123, 124, 123, 124, 123, 124, 123, 
-  124, 126, 126, 126, 126, 126, 126, 126, 126, 126, 
+  117, 117, 117, 117, 117, 117, 117, 117, 117, 118, 
+  118, 119, 119, 119, 119, 119, 119, 119, 119, 122, 
+  70, 70, 70, 70, 123, 124, 123, 124, 123, 124, 
+  123, 124, 126, 126, 126, 126, 126, 126, 126, 126, 
   126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 
-  126, 126, 126, 125, 73, 113, 113, 113, 113, 127, 
-  128, 127, 128, 127, 128, 127, 128, 129, 129, 129, 
+  126, 126, 126, 126, 125, 73, 113, 113, 113, 113, 
+  127, 128, 127, 128, 127, 128, 127, 128, 129, 129, 
   129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 
   129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 
-  129, 129, 106, 106, 106, 106, 131, 132, 131, 132, 
-  131, 131, 132, 132, 133, 133, 133, 133, 135, 71, 
-  71, 71, 136, 136, 137, 62, 60, 61, 138, 121, 
-  82, 130, 134, 120, 139, 139, 139, 139, 58, 58, 
-  58, 58, 58, 58, 58, 58, 58, 58, 74, 69, 
-  69, 77, 111, 102, 102, 102, 102, 102, 140};
+  129, 129, 129, 106, 106, 106, 106, 131, 132, 131, 
+  132, 131, 131, 132, 132, 133, 133, 133, 133, 135, 
+  71, 71, 71, 136, 136, 137, 62, 60, 61, 138, 
+  121, 82, 130, 134, 120, 139, 139, 139, 139, 58, 
+  58, 58, 58, 58, 58, 58, 58, 58, 58, 74, 
+  69, 69, 77, 111, 102, 102, 102, 102, 102, 140};
 
 const short QXmlStreamReader_Table::rhs [] = {
   2, 1, 4, 2, 2, 2, 2, 2, 2, 0, 
   1, 1, 9, 2, 4, 0, 4, 4, 6, 6, 
-  4, 1, 3, 1, 1, 1, 2, 2, 2, 1, 
-  1, 1, 1, 1, 1, 1, 4, 4, 1, 1, 
-  1, 1, 1, 2, 1, 1, 1, 0, 2, 2, 
-  2, 6, 6, 1, 5, 1, 5, 3, 5, 0, 
-  1, 6, 8, 4, 2, 1, 5, 1, 1, 1, 
-  1, 1, 1, 1, 1, 6, 7, 1, 2, 2, 
-  1, 4, 3, 3, 1, 2, 5, 6, 4, 6, 
-  3, 5, 5, 3, 4, 4, 5, 2, 3, 2, 
-  2, 4, 5, 5, 7, 1, 1, 1, 1, 1, 
+  4, 1, 3, 1, 1, 1, 2, 2, 2, 0, 
+  1, 1, 1, 1, 1, 1, 1, 4, 4, 1, 
+  1, 1, 1, 1, 2, 1, 1, 1, 0, 2, 
+  2, 2, 6, 6, 1, 5, 1, 5, 3, 5, 
+  0, 1, 6, 8, 4, 2, 1, 5, 1, 1, 
+  1, 1, 1, 1, 1, 1, 6, 7, 1, 2, 
+  2, 1, 4, 3, 3, 1, 2, 5, 6, 4, 
+  6, 3, 5, 5, 3, 4, 4, 5, 2, 3, 
+  2, 2, 4, 5, 5, 7, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  2, 2, 2, 2, 1, 1, 1, 1, 1, 2, 
-  2, 3, 3, 2, 2, 2, 2, 1, 1, 1, 
+  1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 
+  2, 2, 3, 3, 2, 2, 2, 2, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 1, 1, 1, 2, 2, 3, 3, 2, 
-  2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 1, 1, 1, 2, 2, 3, 3, 
+  2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 2, 2, 3, 3, 2, 2, 2, 2, 
-  1, 1, 1, 1, 1, 1, 1, 1, 5, 0, 
-  1, 3, 1, 3, 2, 4, 3, 5, 1, 3, 
-  3, 3, 3, 4, 1, 1, 2, 2, 2, 4, 
-  2, 2, 2, 2, 2, 2, 2, 0, 1, 0, 
-  1, 1, 1, 1, 1, 1, 1, 1, 2};
+  1, 1, 1, 2, 2, 3, 3, 2, 2, 2, 
+  2, 1, 1, 1, 1, 1, 1, 1, 1, 5, 
+  0, 1, 3, 1, 3, 2, 4, 3, 5, 1, 
+  3, 3, 3, 3, 4, 1, 1, 2, 2, 2, 
+  4, 2, 2, 2, 2, 2, 2, 2, 0, 1, 
+  0, 1, 1, 1, 1, 1, 1, 1, 1, 2};
 
 const short QXmlStreamReader_Table::action_default [] = {
-  10, 258, 0, 2, 1, 0, 124, 116, 118, 119, 
-  126, 128, 122, 11, 113, 107, 0, 108, 127, 110, 
-  114, 112, 120, 123, 125, 106, 109, 111, 117, 115, 
-  130, 121, 239, 12, 253, 135, 249, 252, 0, 129, 
-  139, 256, 16, 251, 137, 136, 0, 255, 138, 258, 
-  230, 257, 254, 0, 0, 263, 0, 246, 245, 0, 
-  248, 247, 244, 240, 98, 262, 0, 235, 0, 0, 
-  259, 96, 97, 100, 0, 131, 133, 132, 134, 0, 
-  0, 260, 0, 0, 175, 0, 172, 164, 166, 167, 
-  141, 153, 170, 161, 155, 156, 152, 158, 162, 160, 
-  168, 171, 151, 154, 157, 159, 165, 163, 173, 169, 
-  149, 174, 0, 143, 147, 145, 150, 140, 148, 0, 
-  146, 142, 144, 0, 15, 14, 261, 0, 22, 21, 
-  260, 0, 0, 20, 0, 0, 31, 36, 30, 0, 
-  32, 260, 0, 33, 0, 24, 0, 34, 0, 26, 
-  35, 25, 0, 241, 40, 39, 260, 42, 48, 260, 
-  41, 0, 43, 260, 48, 260, 0, 260, 0, 48, 
-  0, 47, 45, 46, 50, 51, 260, 260, 0, 56, 
-  260, 53, 260, 0, 57, 0, 54, 260, 52, 260, 
-  0, 55, 64, 0, 260, 60, 260, 0, 58, 61, 
-  62, 0, 260, 0, 0, 59, 63, 44, 49, 65, 
-  0, 38, 0, 0, 260, 0, 93, 94, 0, 0, 
-  0, 0, 260, 0, 209, 200, 202, 204, 177, 189, 
-  207, 198, 192, 190, 193, 188, 195, 197, 205, 208, 
-  187, 191, 194, 196, 201, 199, 203, 206, 210, 212, 
-  211, 185, 0, 0, 242, 179, 183, 181, 0, 0, 
-  92, 186, 176, 184, 0, 182, 178, 180, 91, 0, 
-  95, 0, 0, 0, 0, 0, 260, 85, 260, 0, 
-  261, 0, 86, 0, 88, 68, 73, 72, 69, 70, 
-  71, 260, 74, 75, 0, 0, 0, 268, 267, 265, 
-  266, 264, 66, 260, 0, 260, 0, 0, 67, 76, 
-  260, 0, 260, 0, 0, 77, 0, 78, 0, 81, 
-  84, 0, 0, 214, 224, 223, 0, 226, 228, 227, 
-  225, 0, 243, 216, 220, 218, 222, 213, 221, 0, 
-  219, 215, 217, 0, 80, 79, 0, 82, 0, 83, 
-  87, 99, 0, 37, 0, 0, 0, 0, 90, 89, 
-  0, 102, 23, 27, 29, 28, 0, 0, 260, 261, 
-  0, 260, 0, 105, 104, 260, 0, 103, 101, 0, 
-  0, 18, 260, 17, 0, 19, 0, 0, 250, 0, 
-  260, 0, 238, 0, 231, 237, 0, 236, 233, 260, 
-  260, 261, 232, 234, 0, 260, 0, 229, 260, 0, 
-  260, 0, 230, 0, 0, 13, 269, 9, 5, 8, 
-  4, 0, 7, 258, 6, 0, 3};
+  10, 259, 0, 2, 1, 0, 125, 117, 119, 120, 
+  127, 129, 123, 11, 114, 108, 0, 109, 128, 111, 
+  115, 113, 121, 124, 126, 107, 110, 112, 118, 116, 
+  131, 122, 240, 12, 254, 136, 250, 253, 0, 130, 
+  140, 257, 16, 252, 138, 137, 0, 256, 139, 259, 
+  231, 258, 255, 0, 0, 264, 0, 247, 246, 0, 
+  249, 248, 245, 241, 99, 263, 0, 236, 0, 0, 
+  260, 97, 98, 101, 0, 132, 134, 133, 135, 0, 
+  0, 261, 0, 0, 176, 0, 173, 165, 167, 168, 
+  142, 154, 171, 162, 156, 157, 153, 159, 163, 161, 
+  169, 172, 152, 155, 158, 160, 166, 164, 174, 170, 
+  150, 175, 0, 144, 148, 146, 151, 141, 149, 0, 
+  147, 143, 145, 0, 15, 14, 262, 0, 22, 21, 
+  261, 30, 0, 20, 0, 0, 32, 37, 31, 0, 
+  33, 261, 0, 34, 0, 24, 0, 35, 0, 26, 
+  36, 25, 0, 242, 41, 40, 261, 43, 49, 261, 
+  42, 0, 44, 261, 49, 261, 0, 261, 0, 49, 
+  0, 48, 46, 47, 51, 52, 261, 261, 0, 57, 
+  261, 54, 261, 0, 58, 0, 55, 261, 53, 261, 
+  0, 56, 65, 0, 261, 61, 261, 0, 59, 62, 
+  63, 0, 261, 0, 0, 60, 64, 45, 50, 66, 
+  0, 39, 0, 0, 261, 0, 94, 95, 0, 0, 
+  0, 0, 261, 0, 210, 201, 203, 205, 178, 190, 
+  208, 199, 193, 191, 194, 189, 196, 198, 206, 209, 
+  188, 192, 195, 197, 202, 200, 204, 207, 211, 213, 
+  212, 186, 0, 0, 243, 180, 184, 182, 0, 0, 
+  93, 187, 177, 185, 0, 183, 179, 181, 92, 0, 
+  96, 0, 0, 0, 0, 0, 261, 86, 261, 0, 
+  262, 0, 87, 0, 89, 69, 74, 73, 70, 71, 
+  72, 261, 75, 76, 0, 0, 0, 269, 268, 266, 
+  267, 265, 67, 261, 0, 261, 0, 0, 68, 77, 
+  261, 0, 261, 0, 0, 78, 0, 79, 0, 82, 
+  85, 0, 0, 215, 225, 224, 0, 227, 229, 228, 
+  226, 0, 244, 217, 221, 219, 223, 214, 222, 0, 
+  220, 216, 218, 0, 81, 80, 0, 83, 0, 84, 
+  88, 100, 0, 38, 0, 0, 0, 0, 91, 90, 
+  0, 103, 23, 27, 29, 28, 0, 0, 261, 262, 
+  0, 261, 0, 106, 105, 261, 0, 104, 102, 0, 
+  0, 18, 261, 17, 0, 19, 0, 0, 251, 0, 
+  261, 0, 239, 0, 232, 238, 0, 237, 234, 261, 
+  261, 262, 233, 235, 0, 261, 0, 230, 261, 0, 
+  261, 0, 231, 0, 0, 13, 270, 9, 5, 8, 
+  4, 0, 7, 259, 6, 0, 3};
 
 const short QXmlStreamReader_Table::goto_default [] = {
   2, 4, 3, 49, 388, 43, 37, 52, 47, 41, 
@@ -736,8 +736,8 @@ public:
     }
 };
 
-class QXmlStreamEntityResolver;
 
+class QXmlStreamEntityResolver;
 #ifndef QT_NO_XMLSTREAMREADER
 class QXmlStreamReaderPrivate : public QXmlStreamReader_Table, public QXmlStreamPrivateTagStack{
     QXmlStreamReader *q_ptr;
@@ -1355,44 +1355,44 @@ bool QXmlStreamReaderPrivate::parse()
             scanDtd = false;
         break;
 
-        case 36:
+        case 37:
             if (!scanString(spell[EMPTY], EMPTY, false)
                 && !scanString(spell[ANY], ANY, false)
                 && atEnd) {
-                resume(36);
+                resume(37);
                 return false;
             }
         break;
 
-        case 42:
+        case 43:
             if (!scanString(spell[PCDATA], PCDATA, false) && atEnd) {
-                resume(42);
+                resume(43);
                 return false;
             }
         break;
 
-        case 67: {
+        case 68: {
             lastAttributeIsCData = true;
         } break;
 
-        case 77:
+        case 78:
             if (!scanAfterDefaultDecl() && atEnd) {
-                resume(77);
+                resume(78);
                 return false;
             }
         break;
 
-        case 82:
+        case 83:
                 sym(1) = sym(2);
                 lastAttributeValue.clear();
                 lastAttributeIsCData = false;
                 if (!scanAttType() && atEnd) {
-                    resume(82);
+                    resume(83);
                     return false;
                 }
         break;
 
-        case 83: {
+        case 84: {
             DtdAttribute &dtdAttribute = dtdAttributes.push();
             dtdAttribute.tagName.clear();
             dtdAttribute.isCDATA = lastAttributeIsCData;
@@ -1413,7 +1413,7 @@ bool QXmlStreamReaderPrivate::parse()
             }
         } break;
 
-        case 87: {
+        case 88: {
             if (referenceToUnparsedEntityDetected && !standalone)
                 break;
             int n = dtdAttributes.size();
@@ -1433,9 +1433,9 @@ bool QXmlStreamReaderPrivate::parse()
             }
         } break;
 
-        case 88: {
+        case 89: {
             if (!scanPublicOrSystem() && atEnd) {
-                resume(88);
+                resume(89);
                 return false;
             }
             EntityDeclaration &entityDeclaration = entityDeclarations.push();
@@ -1443,9 +1443,9 @@ bool QXmlStreamReaderPrivate::parse()
             entityDeclaration.name = symString(3);
         } break;
 
-        case 89: {
+        case 90: {
             if (!scanPublicOrSystem() && atEnd) {
-                resume(89);
+                resume(90);
                 return false;
             }
             EntityDeclaration &entityDeclaration = entityDeclarations.push();
@@ -1454,9 +1454,9 @@ bool QXmlStreamReaderPrivate::parse()
             entityDeclaration.parameter = true;
         } break;
 
-        case 90: {
+        case 91: {
             if (!scanNData() && atEnd) {
-                resume(90);
+                resume(91);
                 return false;
             }
             EntityDeclaration &entityDeclaration = entityDeclarations.top();
@@ -1464,9 +1464,9 @@ bool QXmlStreamReaderPrivate::parse()
             entityDeclaration.external = true;
         } break;
 
-        case 91: {
+        case 92: {
             if (!scanNData() && atEnd) {
-                resume(91);
+                resume(92);
                 return false;
             }
             EntityDeclaration &entityDeclaration = entityDeclarations.top();
@@ -1475,7 +1475,7 @@ bool QXmlStreamReaderPrivate::parse()
             entityDeclaration.external = true;
         } break;
 
-        case 92: {
+        case 93: {
             EntityDeclaration &entityDeclaration = entityDeclarations.top();
             entityDeclaration.notationName = symString(3);
             if (entityDeclaration.parameter)
@@ -1483,8 +1483,8 @@ bool QXmlStreamReaderPrivate::parse()
         }
         //fall through
 
-        case 93:
-        case 94: {
+        case 94:
+        case 95: {
             if (referenceToUnparsedEntityDetected && !standalone) {
                 entityDeclarations.pop();
                 break;
@@ -1502,7 +1502,7 @@ bool QXmlStreamReaderPrivate::parse()
             }
         } break;
 
-        case 95: {
+        case 96: {
             setType(QXmlStreamReader::ProcessingInstruction);
             int pos = sym(4).pos + sym(4).len;
             processingInstructionTarget = symString(3);
@@ -1515,39 +1515,39 @@ bool QXmlStreamReaderPrivate::parse()
                 else if(!QXmlUtils::isNCName(piTarget))
                     raiseWellFormedError(QXmlStream::tr("%1 is an invalid processing instruction name.").arg(piTarget));
             } else if (type != QXmlStreamReader::Invalid){
-                resume(95);
+                resume(96);
                 return false;
             }
         } break;
 
-        case 96:
+        case 97:
             setType(QXmlStreamReader::ProcessingInstruction);
             processingInstructionTarget = symString(3);
             if (!processingInstructionTarget.toString().compare(QLatin1String("xml"), Qt::CaseInsensitive))
                 raiseWellFormedError(QXmlStream::tr("Invalid processing instruction name."));
         break;
 
-        case 97:
+        case 98:
             if (!scanAfterLangleBang() && atEnd) {
-                resume(97);
+                resume(98);
                 return false;
             }
         break;
 
-        case 98:
+        case 99:
             if (!scanUntil("--")) {
-                resume(98);
+                resume(99);
                 return false;
             }
         break;
 
-        case 99: {
+        case 100: {
             setType(QXmlStreamReader::Comment);
             int pos = sym(1).pos + 4;
             text = QStringRef(&textBuffer, pos, textBuffer.size() - pos - 3);
         } break;
 
-        case 100: {
+        case 101: {
             setType(QXmlStreamReader::Characters);
             isCDATA = true;
 	    isWhitespace = false;
@@ -1555,131 +1555,131 @@ bool QXmlStreamReaderPrivate::parse()
             if (scanUntil("]]>", -1)) {
                 text = QStringRef(&textBuffer, pos, textBuffer.size() - pos - 3);
             } else {
-                resume(100);
+                resume(101);
                 return false;
             }
         } break;
 
-        case 101: {
+        case 102: {
             if (!scanPublicOrSystem() && atEnd) {
-                resume(101);
+                resume(102);
                 return false;
             }
             NotationDeclaration &notationDeclaration = notationDeclarations.push();
             notationDeclaration.name = symString(3);
         } break;
 
-        case 102: {
+        case 103: {
             NotationDeclaration &notationDeclaration = notationDeclarations.top();
             notationDeclaration.systemId = symString(3);
             notationDeclaration.publicId.clear();
         } break;
 
-        case 103: {
+        case 104: {
             NotationDeclaration &notationDeclaration = notationDeclarations.top();
             notationDeclaration.systemId.clear();
             checkPublicLiteral((notationDeclaration.publicId = symString(3)));
         } break;
 
-        case 104: {
+        case 105: {
             NotationDeclaration &notationDeclaration = notationDeclarations.top();
             checkPublicLiteral((notationDeclaration.publicId = symString(3)));
             notationDeclaration.systemId = symString(5);
         } break;
 
-        case 128:
+        case 129:
             isWhitespace = false;
             // fall through
 
-        case 129:
+        case 130:
             sym(1).len += fastScanContentCharList();
             if (atEnd && !inParseEntity) {
-                resume(129);
+                resume(130);
                 return false;
             }
 	break;
 
-        case 138:
+        case 139:
 	    if (!textBuffer.isEmpty()) {
                 setType(QXmlStreamReader::Characters);
                 text = &textBuffer;
 	    }
 	break;
 
-        case 139:
         case 140:
+        case 141:
             clearSym();
         break;
 
-        case 141:
         case 142:
+        case 143:
             sym(1) = sym(2);
         break;
 
-        case 143:
         case 144:
         case 145:
         case 146:
+        case 147:
             sym(1).len += sym(2).len;
         break;
 
-        case 172:
+        case 173:
 	    if (normalizeLiterals)
                 textBuffer.data()[textBuffer.size()-1] = QLatin1Char(' ');
         break;
 
-        case 173:
+        case 174:
             sym(1).len += fastScanLiteralContent();
             if (atEnd) {
-                resume(173);
+                resume(174);
                 return false;
             }
         break;
 
-        case 174: {
+        case 175: {
             if (!QXmlUtils::isPublicID(symString(1).toString())) {
                 raiseWellFormedError(QXmlStream::tr("%1 is an invalid PUBLIC identifier.").arg(symString(1).toString()));
-                resume(174);
+                resume(175);
                 return false;
             }
         } break;
 
-        case 175:
         case 176:
+        case 177:
             clearSym();
         break;
 
-        case 177:
         case 178:
+        case 179:
 	    sym(1) = sym(2);
         break;
 
-        case 179:
         case 180:
         case 181:
         case 182:
+        case 183:
             sym(1).len += sym(2).len;
         break;
 
-        case 212:
         case 213:
+        case 214:
             clearSym();
         break;
 
-        case 214:
         case 215:
+        case 216:
             sym(1) = sym(2);
             lastAttributeValue = symString(1);
         break;
 
-        case 216:
         case 217:
         case 218:
         case 219:
+        case 220:
             sym(1).len += sym(2).len;
         break;
 
-        case 228: {
+        case 229: {
             QStringRef prefix = symPrefix(1);
             if (prefix.isEmpty() && symString(1) == QLatin1String("xmlns") && namespaceProcessing) {
                 NamespaceDeclaration &namespaceDeclaration = namespaceDeclarations.push();
@@ -1749,7 +1749,7 @@ bool QXmlStreamReaderPrivate::parse()
             }
         } break;
 
-        case 234: {
+        case 235: {
             normalizeLiterals = true;
             Tag &tag = tagStack_push();
             prefix = tag.namespaceDeclaration.prefix  = addToStringStorage(symPrefix(2));
@@ -1759,11 +1759,11 @@ bool QXmlStreamReaderPrivate::parse()
                 raiseWellFormedError(QXmlStream::tr("Invalid XML name."));
         } break;
 
-        case 235:
+        case 236:
             isEmptyElement = true;
         // fall through
 
-        case 236:
+        case 237:
             setType(QXmlStreamReader::StartElement);
             resolveTag();
             if (tagStack.size() == 1 && hasSeenTag && !inParseEntity)
@@ -1771,7 +1771,7 @@ bool QXmlStreamReaderPrivate::parse()
             hasSeenTag = true;
         break;
 
-        case 237: {
+        case 238: {
             setType(QXmlStreamReader::EndElement);
             Tag &tag = tagStack_pop();
 
@@ -1782,7 +1782,7 @@ bool QXmlStreamReaderPrivate::parse()
                 raiseWellFormedError(QXmlStream::tr("Opening and ending tag mismatch."));
         } break;
 
-        case 238:
+        case 239:
             if (entitiesMustBeDeclared()) {
                 raiseWellFormedError(QXmlStream::tr("Entity '%1' not declared.").arg(unresolvedEntity));
                 break;
@@ -1791,7 +1791,7 @@ bool QXmlStreamReaderPrivate::parse()
             name = &unresolvedEntity;
 	break;
 
-        case 239: {
+        case 240: {
             sym(1).len += sym(2).len + 1;
             QString reference = symString(2).toString();
             if (entityHash.contains(reference)) {
@@ -1830,7 +1830,7 @@ bool QXmlStreamReaderPrivate::parse()
 
         } break;
 
-        case 240: {
+        case 241: {
             sym(1).len += sym(2).len + 1;
             QString reference = symString(2).toString();
             if (parameterEntityHash.contains(reference)) {
@@ -1849,11 +1849,11 @@ bool QXmlStreamReaderPrivate::parse()
             }
         } break;
 
-        case 241:
+        case 242:
             sym(1).len += sym(2).len + 1;
         break;
 
-        case 242: {
+        case 243: {
             sym(1).len += sym(2).len + 1;
             QString reference = symString(2).toString();
             if (entityHash.contains(reference)) {
@@ -1889,7 +1889,7 @@ bool QXmlStreamReaderPrivate::parse()
             }
         } break;
 
-        case 243: {
+        case 244: {
             if (uint s = resolveCharRef(3)) {
                 if (s >= 0xffff)
                     putStringLiteral(QString::fromUcs4(&s, 1));
@@ -1903,43 +1903,43 @@ bool QXmlStreamReaderPrivate::parse()
             }
         } break;
 
-        case 246:
         case 247:
+        case 248:
             sym(1).len += sym(2).len;
         break;
 
-        case 258:
+        case 259:
             sym(1).len += fastScanSpace();
             if (atEnd) {
-                resume(258);
+                resume(259);
                 return false;
             }
         break;
 
-        case 261: {
+        case 262: {
             sym(1).len += fastScanName(&sym(1).prefix);
             if (atEnd) {
-                resume(261);
+                resume(262);
                 return false;
             }
         } break;
 
-        case 262:
+        case 263:
             sym(1).len += fastScanName();
             if (atEnd) {
-                resume(262);
+                resume(263);
                 return false;
             }
         break;
 
-        case 263:
         case 264:
         case 265:
         case 266:
         case 267:
+        case 268:
             sym(1).len += fastScanNMTOKEN();
             if (atEnd) {
-                resume(267);
+                resume(268);
                 return false;
             }
 
@@ -1958,7 +1958,8 @@ bool QXmlStreamReaderPrivate::parse()
     }
     return false;
 }
+#endif //QT_NO_XMLSTREAMREADER.xml
+
 
-#endif //QT_NO_XMLSTREAMREADER
 #endif // QXMLSTREAM_P_H
 
-- 
cgit v0.12


From 48e56643f1b7daf7c255a1e58f0e213b06e15f65 Mon Sep 17 00:00:00 2001
From: Prasanth Ullattil <prasanth.ullattil@nokia.com>
Date: Wed, 25 Nov 2009 13:56:00 +0100
Subject: On Windows Flash is played only while moving mouse inside the plugin.

Qt is using the same window message as Flash plugin. We need to check
the window handle before we treat this as Qt internal message.

Reviewed-by: Bradley T. Hughes
---
 src/corelib/kernel/qeventdispatcher_win.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index b3497b9..b197b9d 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -725,7 +725,7 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
                 }
             }
             if (haveMessage) {
-                if (msg.message == WM_QT_SENDPOSTEDEVENTS) {
+                if (d->internalHwnd == msg.hwnd && msg.message == WM_QT_SENDPOSTEDEVENTS) {
                     if (seenWM_QT_SENDPOSTEDEVENTS) {
                         needWM_QT_SENDPOSTEDEVENTS = true;
                         continue;
-- 
cgit v0.12


From e506a8dcd7d29ce32d339b05a2e3b904d4b4ed0c Mon Sep 17 00:00:00 2001
From: Benjamin Poulain <benjamin.poulain@nokia.com>
Date: Wed, 25 Nov 2009 12:56:18 +0100
Subject: Fix the tablet device recognition on Windows

The unique ID was not taking into account the bits 4, 5, 6,
7 of CSR_TYPE. Those bytes identify similar devices with different
flavor/color.

The cursor data were also not updated correctly. The information
were only updated if the pointer type changes (e.g.: pen to eraser)
but not if the physical device change (e.g. stylus to brush). The
information are now updated every time a proximity event has a
new unique ID.

Reviewed-by: Denis Dzyubenko
Task-number: QTBUG-1930
---
 src/gui/kernel/qapplication_win.cpp | 199 +++++++++++++++++++++---------------
 1 file changed, 115 insertions(+), 84 deletions(-)

diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index 05e75a2..b677228 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -243,8 +243,12 @@ static PtrWTGet ptrWTGet = 0;
 static PACKET localPacketBuf[QT_TABLET_NPACKETQSIZE];  // our own tablet packet queue.
 HCTX qt_tablet_context;  // the hardware context for the tablet (like a window handle)
 bool qt_tablet_tilt_support;
-static void tabletInit(UINT wActiveCsr, HCTX hTab);
+
+#ifndef QT_NO_TABLETEVENT
+static void tabletInit(const quint64 uniqueId, const UINT csr_type, HCTX hTab);
+static void tabletUpdateCursor(QTabletDeviceData &tdd, const UINT currentCursor);
 static void initWinTabFunctions();        // resolve the WINTAB api functions
+#endif // QT_NO_TABLETEVENT
 
 
 #ifndef QT_NO_ACCESSIBILITY
@@ -256,7 +260,7 @@ extern QWidget* qt_get_tablet_widget();
 extern bool qt_sendSpontaneousEvent(QObject*, QEvent*);
 extern QRegion qt_dirtyRegion(QWidget *);
 
-typedef QHash<UINT, QTabletDeviceData> QTabletCursorInfo;
+typedef QHash<quint64, QTabletDeviceData> QTabletCursorInfo;
 Q_GLOBAL_STATIC(QTabletCursorInfo, tCursorInfo)
 QTabletDeviceData currentTabletPointer;
 
@@ -791,7 +795,9 @@ void qt_init(QApplicationPrivate *priv, int)
     if (QApplication::desktopSettingsAware())
         qt_set_windows_resources();
 
+#ifndef QT_NO_TABLETEVENT
     initWinTabFunctions();
+#endif // QT_NO_TABLETEVENT
     QApplicationPrivate::inputContext = new QWinInputContext(0);
 
     // Read the initial cleartype settings...
@@ -2325,25 +2331,43 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
             }
             break;
         case WT_PROXIMITY:
-            if (ptrWTPacketsGet) {
-                bool enteredProximity = LOWORD(lParam) != 0;
-                PACKET proximityBuffer[QT_TABLET_NPACKETQSIZE];
-                int totalPacks = ptrWTPacketsGet(qt_tablet_context, QT_TABLET_NPACKETQSIZE, proximityBuffer);
-                if (totalPacks > 0 && enteredProximity) {
-                    uint currentCursor = proximityBuffer[0].pkCursor;
-                    if (!tCursorInfo()->contains(currentCursor))
-                        tabletInit(currentCursor, qt_tablet_context);
-                    currentTabletPointer = tCursorInfo()->value(currentCursor);
+
+            #ifndef QT_NO_TABLETEVENT
+            if (ptrWTPacketsGet && ptrWTInfo) {
+                const bool enteredProximity = LOWORD(lParam) != 0;
+                PACKET proximityBuffer[1]; // we are only interested in the first packet in this case
+                const int totalPacks = ptrWTPacketsGet(qt_tablet_context, 1, proximityBuffer);
+                if (totalPacks > 0) {
+                    const UINT currentCursor = proximityBuffer[0].pkCursor;
+
+                    UINT csr_physid;
+                    ptrWTInfo(WTI_CURSORS + currentCursor, CSR_PHYSID, &csr_physid);
+                    UINT csr_type;
+                    ptrWTInfo(WTI_CURSORS + currentCursor, CSR_TYPE, &csr_type);
+                    const UINT deviceIdMask = 0xFF6; // device type mask && device color mask
+                    quint64 uniqueId = (csr_type & deviceIdMask);
+                    uniqueId = (uniqueId << 32) | csr_physid;
+
+                    // initialising and updating the cursor should be done in response to
+                    // WT_CSRCHANGE. We do it in WT_PROXIMITY because some wintab never send
+                    // the event WT_CSRCHANGE even if asked with CXO_CSRMESSAGES
+                    const QTabletCursorInfo *const globalCursorInfo = tCursorInfo();
+                    if (!globalCursorInfo->contains(uniqueId))
+                        tabletInit(uniqueId, csr_type, qt_tablet_context);
+
+                    currentTabletPointer = globalCursorInfo->value(uniqueId);
+                    tabletUpdateCursor(currentTabletPointer, currentCursor);
                 }
                 qt_tabletChokeMouse = false;
-#ifndef QT_NO_TABLETEVENT
+
                 QTabletEvent tabletProximity(enteredProximity ? QEvent::TabletEnterProximity
                                                               : QEvent::TabletLeaveProximity,
                                              QPoint(), QPoint(), QPointF(), currentTabletPointer.currentDevice, currentTabletPointer.currentPointerType, 0, 0,
                                              0, 0, 0, 0, 0, currentTabletPointer.llId);
                 QApplication::sendEvent(qApp, &tabletProximity);
-#endif // QT_NO_TABLETEVENT
             }
+            #endif // QT_NO_TABLETEVENT
+
             break;
 #ifdef Q_WS_WINCE_WM
         case WM_SETFOCUS: {
@@ -3317,63 +3341,57 @@ bool QETWidget::translateWheelEvent(const MSG &msg)
 
 // the following is adapted from the wintab syspress example (public domain)
 /* -------------------------------------------------------------------------- */
-static void tabletInit(UINT wActiveCsr, HCTX hTab)
+// Initialize the "static" information of a cursor device (pen, airbrush, etc).
+// The QTabletDeviceData is initialized with the data that do not change in time
+// (number of button, type of device, etc) but do not initialize the variable data
+// (e.g.: pen or eraser)
+#ifndef QT_NO_TABLETEVENT
+
+static void tabletInit(const quint64 uniqueId, const UINT csr_type, HCTX hTab)
 {
+    Q_ASSERT(ptrWTInfo);
+    Q_ASSERT(ptrWTGet);
+
+    Q_ASSERT(!tCursorInfo()->contains(uniqueId));
+
     /* browse WinTab's many info items to discover pressure handling. */
-    if (ptrWTInfo && ptrWTGet) {
-        AXIS np;
-        LOGCONTEXT lc;
-        BYTE wPrsBtn;
-        BYTE logBtns[32];
-        UINT size;
-
-        /* discover the LOGICAL button generated by the pressure channel. */
-        /* get the PHYSICAL button from the cursor category and run it */
-        /* through that cursor's button map (usually the identity map). */
-        wPrsBtn = (BYTE)-1;
-        ptrWTInfo(WTI_CURSORS + wActiveCsr, CSR_NPBUTTON, &wPrsBtn);
-        size = ptrWTInfo(WTI_CURSORS + wActiveCsr, CSR_BUTTONMAP, &logBtns);
-        if ((UINT)wPrsBtn < size)
-            wPrsBtn = logBtns[wPrsBtn];
-
-        /* get the current context for its device variable. */
-        ptrWTGet(hTab, &lc);
-
-        /* get the size of the pressure axis. */
-        QTabletDeviceData tdd;
-        ptrWTInfo(WTI_DEVICES + lc.lcDevice, DVC_NPRESSURE, &np);
-        tdd.minPressure = int(np.axMin);
-        tdd.maxPressure = int(np.axMax);
-
-        ptrWTInfo(WTI_DEVICES + lc.lcDevice, DVC_TPRESSURE, &np);
-        tdd.minTanPressure = int(np.axMin);
-        tdd.maxTanPressure = int(np.axMax);
-
-        LOGCONTEXT lcMine;
-
-      	/* get default region */
-        ptrWTInfo(WTI_DEFCONTEXT, 0, &lcMine);
-
-        tdd.minX = 0;
-        tdd.maxX = int(lcMine.lcInExtX) - int(lcMine.lcInOrgX);
-
-        tdd.minY = 0;
-        tdd.maxY = int(lcMine.lcInExtY) - int(lcMine.lcInOrgY);
-
-        tdd.minZ = 0;
-        tdd.maxZ = int(lcMine.lcInExtZ) - int(lcMine.lcInOrgZ);
-
-        int csr_type,
-            csr_physid;
-        ptrWTInfo(WTI_CURSORS + wActiveCsr, CSR_TYPE, &csr_type);
-        ptrWTInfo(WTI_CURSORS + wActiveCsr, CSR_PHYSID, &csr_physid);
-        tdd.llId = csr_type & 0x0F06;
-        tdd.llId = (tdd.llId << 24) | csr_physid;
-#ifndef QT_NO_TABLETEVENT
-        if (((csr_type & 0x0006) == 0x0002) && ((csr_type & 0x0F06) != 0x0902)) {
-            tdd.currentDevice = QTabletEvent::Stylus;
-        } else {
-            switch (csr_type & 0x0F06) {
+    AXIS np;
+    LOGCONTEXT lc;
+
+    /* get the current context for its device variable. */
+    ptrWTGet(hTab, &lc);
+
+    /* get the size of the pressure axis. */
+    QTabletDeviceData tdd;
+    tdd.llId = uniqueId;
+
+    ptrWTInfo(WTI_DEVICES + lc.lcDevice, DVC_NPRESSURE, &np);
+    tdd.minPressure = int(np.axMin);
+    tdd.maxPressure = int(np.axMax);
+
+    ptrWTInfo(WTI_DEVICES + lc.lcDevice, DVC_TPRESSURE, &np);
+    tdd.minTanPressure = int(np.axMin);
+    tdd.maxTanPressure = int(np.axMax);
+
+    LOGCONTEXT lcMine;
+
+    /* get default region */
+    ptrWTInfo(WTI_DEFCONTEXT, 0, &lcMine);
+
+    tdd.minX = 0;
+    tdd.maxX = int(lcMine.lcInExtX) - int(lcMine.lcInOrgX);
+
+    tdd.minY = 0;
+    tdd.maxY = int(lcMine.lcInExtY) - int(lcMine.lcInOrgY);
+
+    tdd.minZ = 0;
+    tdd.maxZ = int(lcMine.lcInExtZ) - int(lcMine.lcInOrgZ);
+
+    const uint cursorTypeBitMask = 0x0F06; // bitmask to find the specific cursor type (see Wacom FAQ)
+    if (((csr_type & 0x0006) == 0x0002) && ((csr_type & cursorTypeBitMask) != 0x0902)) {
+        tdd.currentDevice = QTabletEvent::Stylus;
+    } else {
+        switch (csr_type & cursorTypeBitMask) {
             case 0x0802:
                 tdd.currentDevice = QTabletEvent::Stylus;
                 break;
@@ -3391,26 +3409,34 @@ static void tabletInit(UINT wActiveCsr, HCTX hTab)
                 break;
             default:
                 tdd.currentDevice = QTabletEvent::NoDevice;
-            }
-        }
-
-        switch (wActiveCsr % 3) {
-        case 2:
-            tdd.currentPointerType = QTabletEvent::Eraser;
-            break;
-        case 1:
-            tdd.currentPointerType = QTabletEvent::Pen;
-            break;
-        case 0:
-            tdd.currentPointerType = QTabletEvent::Cursor;
-            break;
-        default:
-            tdd.currentPointerType = QTabletEvent::UnknownPointer;
         }
+    }
+    tCursorInfo()->insert(uniqueId, tdd);
+}
 #endif // QT_NO_TABLETEVENT
-        tCursorInfo()->insert(wActiveCsr, tdd);
+
+// Update the "dynamic" informations of a cursor device (pen, airbrush, etc).
+// The dynamic information is the information of QTabletDeviceData that can change
+// in time (eraser or pen if a device is turned around).
+#ifndef QT_NO_TABLETEVENT
+
+static void tabletUpdateCursor(QTabletDeviceData &tdd, const UINT currentCursor)
+{
+    switch (currentCursor % 3) { // %3 for dual track
+    case 0:
+        tdd.currentPointerType = QTabletEvent::Cursor;
+        break;
+    case 1:
+        tdd.currentPointerType = QTabletEvent::Pen;
+        break;
+    case 2:
+        tdd.currentPointerType = QTabletEvent::Eraser;
+        break;
+    default:
+        tdd.currentPointerType = QTabletEvent::UnknownPointer;
     }
 }
+#endif // QT_NO_TABLETEVENT
 
 bool QETWidget::translateTabletEvent(const MSG &msg, PACKET *localPacketBuf,
                                       int numPackets)
@@ -3546,6 +3572,10 @@ bool QETWidget::translateTabletEvent(const MSG &msg, PACKET *localPacketBuf,
 }
 
 extern bool qt_is_gui_used;
+
+
+#ifndef QT_NO_TABLETEVENT
+
 static void initWinTabFunctions()
 {
 #if defined(Q_OS_WINCE)
@@ -3564,6 +3594,7 @@ static void initWinTabFunctions()
     }
 #endif // Q_OS_WINCE
 }
+#endif // QT_NO_TABLETEVENT
 
 
 //
-- 
cgit v0.12


From af628d615a6e28a5c539bec818f0eb9792f05756 Mon Sep 17 00:00:00 2001
From: Jedrzej Nowacki <jedrzej.nowacki@nokia.com>
Date: Wed, 25 Nov 2009 13:20:25 +0200
Subject: Fix Broadcast receiver example.

The broadcast receiver should share the port number. In most cases users
won't run the example on a network, but only on one machine. In the case
it simply should work too.

According to our documentation the fix is platform specific, it will
work only on Linux.

Reviewed-by: Peter Hartmann
---
 examples/network/broadcastreceiver/receiver.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/network/broadcastreceiver/receiver.cpp b/examples/network/broadcastreceiver/receiver.cpp
index 0a5922b..7889a05 100644
--- a/examples/network/broadcastreceiver/receiver.cpp
+++ b/examples/network/broadcastreceiver/receiver.cpp
@@ -52,7 +52,7 @@ Receiver::Receiver(QWidget *parent)
 
 //! [0]
     udpSocket = new QUdpSocket(this);
-    udpSocket->bind(45454);
+    udpSocket->bind(45454, QUdpSocket::ShareAddress);
 //! [0]
 
 //! [1]
-- 
cgit v0.12


From 8ebc15eb2768fab8a9e746785e0c67efb4ace02b Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" <bradley.hughes@nokia.com>
Date: Wed, 25 Nov 2009 15:19:13 +0100
Subject: Compile for 64-bit Windows

The integral type should be a 64-bit integer, not long (which is only 32-bit
even when building 64-bit).

Reviewed-by: Prasanth Ullattil
Task-number: QTBUG-6079
---
 src/corelib/thread/qbasicatomic.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h
index 7b86ee0..5017dbd 100644
--- a/src/corelib/thread/qbasicatomic.h
+++ b/src/corelib/thread/qbasicatomic.h
@@ -137,7 +137,12 @@ public:
 #if defined(QT_ARCH_WINDOWS) || defined(QT_ARCH_WINDOWSCE)
     union {
         T * volatile _q_value;
-        long volatile _q_value_integral;
+#  if !defined(Q_OS_WINCE) && !defined(__i386__) && !defined(_M_IX86)
+        qint64
+#  else
+        long
+#  endif
+        volatile _q_value_integral;
     };
 #else
     T * volatile _q_value;
-- 
cgit v0.12


From 7f2f38d48b58b6b1ef90198bf2d03422826a5b08 Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Date: Wed, 25 Nov 2009 15:38:45 +0100
Subject: Cocoa: 'Quit' in menu bar does not work

If you have two window, each with its own menu bar that
has a 'Quit' action, we reuse the quit menu item when
switching between the windows. Now, it we deleteLater one of
the menu bars, the new menubar will update the 'Quit' item
just before deleteLater will come along and remote the update
again. This patch will fix this.

Task-number: QTBUG-4684
Reviewed-by: Prasanth
---
 src/gui/kernel/qcocoamenuloader_mac.mm | 7 ++++++-
 src/gui/widgets/qmenu_mac.mm           | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/gui/kernel/qcocoamenuloader_mac.mm b/src/gui/kernel/qcocoamenuloader_mac.mm
index 9ab077f..990571d 100644
--- a/src/gui/kernel/qcocoamenuloader_mac.mm
+++ b/src/gui/kernel/qcocoamenuloader_mac.mm
@@ -76,9 +76,14 @@ QT_USE_NAMESPACE
 
 - (void)ensureAppMenuInMenu:(NSMenu *)menu
 {
+    // The application menu is the menu in the menu bar that contains the
+    // 'Quit' item. When changing menu bar (e.g when swithing between
+    // windows with different menu bars), we never recreate this menu, but
+    // instead pull it out the current menu bar and place into the new one:
     NSMenu *mainMenu = [NSApp mainMenu];
     if ([NSApp mainMenu] == menu)
-        return; // nothing to do!
+        return; // nothing to do (menu is the current menu bar)!
+
 #ifndef QT_NAMESPACE
     Q_ASSERT(mainMenu);
 #endif
diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm
index 9510cc6..8b371e5 100644
--- a/src/gui/widgets/qmenu_mac.mm
+++ b/src/gui/widgets/qmenu_mac.mm
@@ -774,8 +774,12 @@ QMacMenuAction::~QMacMenuAction()
                    && menuItem != [getMenuLoader() quitMenuItem]) {
             [menuItem setHidden:YES];
         }
+        // Only clear the tag if it points to this action. Since items like
+        // 'Quit' is being reused, we sometimes end up redirecting the item
+        // before deleting the assosiated action.
+        if (action.data() == reinterpret_cast<QAction *>([menuItem tag]))
+            [menuItem setTag:nil];
     }
-    [menuItem setTag:nil];
     [menuItem release];
 #endif
 }
-- 
cgit v0.12


From 4d7b7dc0bdd12188d92a5d05a35991af7b53cc81 Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Date: Wed, 25 Nov 2009 16:00:41 +0100
Subject: Mac: deleting a menu item might clear items in other menus

The reson is that some menu items are reused across all menu bars.
So we need to check that a menu actually still owns the item before
clearing or hiding its data.

Reviewed-by: Prasanth
---
 src/gui/widgets/qmenu_mac.mm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm
index 8b371e5..30bbd31 100644
--- a/src/gui/widgets/qmenu_mac.mm
+++ b/src/gui/widgets/qmenu_mac.mm
@@ -763,7 +763,9 @@ QMacMenuAction::~QMacMenuAction()
 {
 #ifdef QT_MAC_USE_COCOA
     [menu release];
-    if (action) {
+    // Update the menu item if this action still owns it. For some items
+    // (like 'Quit') ownership will be transferred between all menu bars...
+    if (action && action.data() == reinterpret_cast<QAction *>([menuItem tag])) {
         QAction::MenuRole role = action->menuRole();
         // Check if the item is owned by Qt, and should be hidden to keep it from causing
         // problems. Do it for everything but the quit menu item since that should always
@@ -774,11 +776,7 @@ QMacMenuAction::~QMacMenuAction()
                    && menuItem != [getMenuLoader() quitMenuItem]) {
             [menuItem setHidden:YES];
         }
-        // Only clear the tag if it points to this action. Since items like
-        // 'Quit' is being reused, we sometimes end up redirecting the item
-        // before deleting the assosiated action.
-        if (action.data() == reinterpret_cast<QAction *>([menuItem tag]))
-            [menuItem setTag:nil];
+        [menuItem setTag:nil];
     }
     [menuItem release];
 #endif
-- 
cgit v0.12