Merge commit 'qt/master'

Conflicts:
	examples/opengl/samplebuffers/glwidget.cpp
	src/corelib/io/qfsfileengine_unix.cpp
	src/corelib/kernel/qobject.cpp
	src/corelib/tools/qsharedpointer.cpp
	src/gui/gui.pro
	tests/auto/qhttp/tst_qhttp.cpp
	tests/auto/qkeyevent/tst_qkeyevent.cpp

10 files changed, 210 insertions, 6 deletions

diff --git a/tests/manual/qdesktopwidget/main.cpp b/tests/manual/qdesktopwidget/main.cpp
index 653a5fc..eeabb1d 100644
--- a/tests/manual/qdesktopwidget/main.cpp
+++ b/tests/manual/qdesktopwidget/main.cpp
@@ -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 http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/qtabletevent/main.cpp b/tests/manual/qtabletevent/main.cpp
new file mode 100644
index 0000000..4014d58
--- /dev/null
+++ b/tests/manual/qtabletevent/main.cpp
@@ -0,0 +1,9 @@
+#include <QtGui>
+#include "tabletwidget.h"
+
+int main(int argc, char **argv) {
+  QApplication app(argc, argv);
+  TabletWidget tabletWidget;
+  tabletWidget.showMaximized();
+  return app.exec();
+} 
diff --git a/tests/manual/qtabletevent/qtabletevent.pro b/tests/manual/qtabletevent/qtabletevent.pro
new file mode 100644
index 0000000..e0ed549
--- /dev/null
+++ b/tests/manual/qtabletevent/qtabletevent.pro
@@ -0,0 +1,13 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Mon Aug 10 17:02:09 2009
+######################################################################
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp\
+    tabletwidget.cpp
+HEADERS += tabletwidget.h
diff --git a/tests/manual/qtabletevent/tabletwidget.cpp b/tests/manual/qtabletevent/tabletwidget.cpp
new file mode 100644
index 0000000..4d6a365
--- /dev/null
+++ b/tests/manual/qtabletevent/tabletwidget.cpp
@@ -0,0 +1,150 @@
+#include "tabletwidget.h"
+#include <QPainter>
+#include <QApplication>
+
+TabletWidget::TabletWidget()
+{
+    QPalette newPalette = palette();
+    newPalette.setColor(QPalette::Window, Qt::white);
+    setPalette(newPalette);
+    qApp->installEventFilter(this);
+    resetAttributes();
+}
+
+bool TabletWidget::eventFilter(QObject *, QEvent *ev)
+{
+    switch (ev->type()) {
+    case QEvent::TabletEnterProximity:
+    case QEvent::TabletLeaveProximity:
+    case QEvent::TabletMove:
+    case QEvent::TabletPress:
+    case QEvent::TabletRelease:
+        {
+            QTabletEvent *event = static_cast<QTabletEvent*>(ev);
+            mType = event->type();
+            mPos = event->pos();
+            mGPos = event->globalPos();
+            mHiResGlobalPos = event->hiResGlobalPos();
+            mDev = event->device();
+            mPointerType = event->pointerType();
+            mUnique = event->uniqueId();
+            mXT = event->xTilt();
+            mYT = event->yTilt();
+            mZ = event->z();
+            mPress = event->pressure();
+            mTangential = event->tangentialPressure();
+            mRot = event->rotation();
+            if (isVisible())
+                update();
+            break;
+        }
+    case QEvent::MouseMove:
+        {
+            resetAttributes();
+            QMouseEvent *event = static_cast<QMouseEvent*>(ev);
+            mType = event->type();
+            mPos = event->pos();
+            mGPos = event->globalPos();
+        }
+    default:
+        break;
+    }
+    return false;
+}
+
+void TabletWidget::paintEvent(QPaintEvent *event)
+{
+    QPainter painter(this);
+
+    QStringList eventInfo;
+
+    QString typeString("Event type: ");
+    switch (mType) {
+    case QEvent::TabletEnterProximity:
+        typeString += "QEvent::TabletEnterProximity";
+        break;
+    case QEvent::TabletLeaveProximity:
+        typeString += "QEvent::TabletLeaveProximity";
+        break;
+    case QEvent::TabletMove:
+        typeString += "QEvent::TabletMove";
+        break;
+    case QEvent::TabletPress:
+        typeString += "QEvent::TabletPress";
+        break;
+    case QEvent::TabletRelease:
+        typeString += "QEvent::TabletRelease";
+        break;
+    case QEvent::MouseMove:
+        typeString += "QEvent::MouseMove";
+        break;
+    }
+    eventInfo << typeString;
+
+    eventInfo << QString("Global position: %1 %2").arg(QString::number(mGPos.x()), QString::number(mGPos.y()));
+    eventInfo << QString("Local position: %1 %2").arg(QString::number(mPos.x()), QString::number(mPos.y()));
+    if (mType == QEvent::TabletEnterProximity || mType == QEvent::TabletLeaveProximity
+        || mType == QEvent::TabletMove || mType == QEvent::TabletPress
+        || mType == QEvent::TabletRelease) {
+
+        eventInfo << QString("Hight res global position: %1 %2").arg(QString::number(mHiResGlobalPos.x()), QString::number(mHiResGlobalPos.y()));
+
+        QString pointerType("Pointer type: ");
+        switch (mPointerType) {
+        case QTabletEvent::UnknownPointer:
+            pointerType += "QTabletEvent::UnknownPointer";
+            break;
+        case QTabletEvent::Pen:
+            pointerType += "QTabletEvent::Pen";
+            break;
+        case QTabletEvent::Cursor:
+            pointerType += "QTabletEvent::Cursor";
+            break;
+        case QTabletEvent::Eraser:
+            pointerType += "QTabletEvent::Eraser";
+            break;
+        }
+        eventInfo << pointerType;
+
+
+        QString deviceString = "Device type: ";
+        switch (mDev) {
+        case QTabletEvent::NoDevice:
+            deviceString += "QTabletEvent::NoDevice";
+            break;
+        case QTabletEvent::Puck:
+            deviceString += "QTabletEvent::Puck";
+            break;
+        case QTabletEvent::Stylus:
+            deviceString += "QTabletEvent::Stylus";
+            break;
+        case QTabletEvent::Airbrush:
+            deviceString += "QTabletEvent::Airbrush";
+            break;
+        case QTabletEvent::FourDMouse:
+            deviceString += "QTabletEvent::FourDMouse";
+            break;
+        case QTabletEvent::RotationStylus:
+            deviceString += "QTabletEvent::RotationStylus";
+            break;
+        }
+        eventInfo << deviceString;
+
+        eventInfo << QString("Pressure: %1").arg(QString::number(mPress));
+        eventInfo << QString("Tangential pressure: %1").arg(QString::number(mTangential));
+        eventInfo << QString("Rotation: %1").arg(QString::number(mRot));
+        eventInfo << QString("xTilt: %1").arg(QString::number(mXT));
+        eventInfo << QString("yTilt: %1").arg(QString::number(mYT));
+        eventInfo << QString("z: %1").arg(QString::number(mZ));
+
+        eventInfo << QString("Unique Id: %1").arg(QString::number(mUnique));
+    }
+
+    painter.drawText(rect(), eventInfo.join("\n"));
+}
+
+void TabletWidget::tabletEvent(QTabletEvent *event)
+{
+    event->accept();
+}
+
diff --git a/tests/manual/qtabletevent/tabletwidget.h b/tests/manual/qtabletevent/tabletwidget.h
new file mode 100644
index 0000000..b0efef2
--- /dev/null
+++ b/tests/manual/qtabletevent/tabletwidget.h
@@ -0,0 +1,32 @@
+#ifndef TABLETWIDGET_H
+#define TABLETWIDGET_H
+
+#include <QWidget>
+#include <QTabletEvent>
+
+// a widget showing the information of the last tablet event
+class TabletWidget : public QWidget
+{
+public:
+    TabletWidget();
+protected:
+    bool eventFilter(QObject *obj, QEvent *ev);
+    void tabletEvent(QTabletEvent *event);
+    void paintEvent(QPaintEvent *event);
+private:
+    void resetAttributes() {
+        mType = mDev = mPointerType = mXT = mYT = mZ = 0;
+        mPress = mTangential = mRot = 0.0;
+        mPos = mGPos = QPoint();
+        mHiResGlobalPos = QPointF();
+        mUnique = 0;
+    }
+    int mType;
+    QPoint mPos, mGPos;
+    QPointF mHiResGlobalPos;
+    int mDev, mPointerType, mXT, mYT, mZ;
+    qreal mPress, mTangential, mRot;
+    qint64 mUnique;
+};
+
+#endif // TABLETWIDGET_H
diff --git a/tests/manual/windowflags/controllerwindow.cpp b/tests/manual/windowflags/controllerwindow.cpp
index 055ff40..9c212c3 100644
--- a/tests/manual/windowflags/controllerwindow.cpp
+++ b/tests/manual/windowflags/controllerwindow.cpp
@@ -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 http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/windowflags/controllerwindow.h b/tests/manual/windowflags/controllerwindow.h
index 3d315be..492eb32 100644
--- a/tests/manual/windowflags/controllerwindow.h
+++ b/tests/manual/windowflags/controllerwindow.h
@@ -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 http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/windowflags/main.cpp b/tests/manual/windowflags/main.cpp
index 011ca3f..6bd404f 100644
--- a/tests/manual/windowflags/main.cpp
+++ b/tests/manual/windowflags/main.cpp
@@ -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 http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/windowflags/previewwindow.cpp b/tests/manual/windowflags/previewwindow.cpp
index 796bdb9..f71a507 100644
--- a/tests/manual/windowflags/previewwindow.cpp
+++ b/tests/manual/windowflags/previewwindow.cpp
@@ -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 http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/manual/windowflags/previewwindow.h b/tests/manual/windowflags/previewwindow.h
index 90ed8ba..afea69a 100644
--- a/tests/manual/windowflags/previewwindow.h
+++ b/tests/manual/windowflags/previewwindow.h
@@ -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 http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/