Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend

Conflicts:
	src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp
	src/script/qscriptecmafunction.cpp
	src/script/qscriptecmaglobal.cpp
	src/script/qscriptengine.cpp
	src/script/qscriptengine_p.cpp
	src/script/qscriptenginefwd_p.h
	src/script/qscriptextqobject.cpp
	src/script/qscriptextqobject_p.h
	tests/auto/qscriptqobject/tst_qscriptqobject.cpp

39 files changed, 2191 insertions, 35 deletions

diff --git a/examples/activeqt/dotnet/wrapper/lib/tools.cpp b/examples/activeqt/dotnet/wrapper/lib/tools.cpp
index 856b5c8..eac2d78 100644
--- a/examples/activeqt/dotnet/wrapper/lib/tools.cpp
+++ b/examples/activeqt/dotnet/wrapper/lib/tools.cpp
@@ -56,6 +56,6 @@ String *QStringToString(const QString &qstring)
 QString StringToQString(String *string)
 {
     const wchar_t __pin *chars = PtrToStringChars(string);
-    return QString::fromUtf16((const ushort *)chars);
+    return QString::fromWCharArray(chars);
 }
 //! [1]
diff --git a/examples/animation/animatedtiles/main.cpp b/examples/animation/animatedtiles/main.cpp
index 9360d7c..c0d55f3 100644
--- a/examples/animation/animatedtiles/main.cpp
+++ b/examples/animation/animatedtiles/main.cpp
@@ -178,7 +178,7 @@ int main(int argc, char **argv)
     QState *centeredState = new QState(rootState);
 
     // Values
-    for (int i = 0; i < 64; ++i) {
+    for (int i = 0; i < items.count(); ++i) {
         Pixmap *item = items.at(i);
         // Ellipse
         ellipseState->assignProperty(item, "pos",
@@ -219,7 +219,7 @@ int main(int argc, char **argv)
     rootState->setInitialState(centeredState);
 
     QParallelAnimationGroup *group = new QParallelAnimationGroup;
-    for (int i = 0; i < 64; ++i) {
+    for (int i = 0; i < items.count(); ++i) {
         QPropertyAnimation *anim = new QPropertyAnimation(items[i], "pos");
         anim->setDuration(750 + i * 25);
         anim->setEasingCurve(QEasingCurve::InOutBack);
@@ -229,7 +229,7 @@ int main(int argc, char **argv)
     trans->addAnimation(group);
 
     group = new QParallelAnimationGroup;
-    for (int i = 0; i < 64; ++i) {
+    for (int i = 0; i < items.count(); ++i) {
         QPropertyAnimation *anim = new QPropertyAnimation(items[i], "pos");
         anim->setDuration(750 + i * 25);
         anim->setEasingCurve(QEasingCurve::InOutBack);
@@ -239,7 +239,7 @@ int main(int argc, char **argv)
     trans->addAnimation(group);
 
     group = new QParallelAnimationGroup;
-    for (int i = 0; i < 64; ++i) {
+    for (int i = 0; i < items.count(); ++i) {
         QPropertyAnimation *anim = new QPropertyAnimation(items[i], "pos");
         anim->setDuration(750 + i * 25);
         anim->setEasingCurve(QEasingCurve::InOutBack);
@@ -249,7 +249,7 @@ int main(int argc, char **argv)
     trans->addAnimation(group);
 
     group = new QParallelAnimationGroup;
-    for (int i = 0; i < 64; ++i) {
+    for (int i = 0; i < items.count(); ++i) {
         QPropertyAnimation *anim = new QPropertyAnimation(items[i], "pos");
         anim->setDuration(750 + i * 25);
         anim->setEasingCurve(QEasingCurve::InOutBack);
@@ -259,7 +259,7 @@ int main(int argc, char **argv)
     trans->addAnimation(group);
 
     group = new QParallelAnimationGroup;
-    for (int i = 0; i < 64; ++i) {
+    for (int i = 0; i < items.count(); ++i) {
         QPropertyAnimation *anim = new QPropertyAnimation(items[i], "pos");
         anim->setDuration(750 + i * 25);
         anim->setEasingCurve(QEasingCurve::InOutBack);
diff --git a/examples/animation/moveblocks/main.cpp b/examples/animation/moveblocks/main.cpp
index 4843a89..c43e841 100644
--- a/examples/animation/moveblocks/main.cpp
+++ b/examples/animation/moveblocks/main.cpp
@@ -42,6 +42,7 @@
 #include <QtCore>
 #include <QtGui>
 
+//![15]
 class StateSwitchEvent: public QEvent
 {
 public:
@@ -63,8 +64,9 @@ public:
 private:
     int m_rand;
 };
+//![15]
 
-
+//![16]
 class QGraphicsRectWidget : public QGraphicsWidget
 {
 public:
@@ -74,6 +76,7 @@ public:
         painter->fillRect(rect(), Qt::blue);
     }
 };
+//![16]
 
 class StateSwitchTransition: public QAbstractTransition
 {
@@ -85,11 +88,13 @@ public:
     }
 
 protected:
+//![14]
     virtual bool eventTest(QEvent *event)
     {
         return (event->type() == QEvent::Type(StateSwitchEvent::StateSwitchType))
             && (static_cast<StateSwitchEvent *>(event)->rand() == m_rand);
     }
+//![14]
 
     virtual void onTransition(QEvent *) {}
 
@@ -97,6 +102,7 @@ private:
     int m_rand;
 };
 
+//![10]
 class StateSwitcher : public QState
 {
     Q_OBJECT
@@ -105,7 +111,9 @@ public:
         : QState(machine->rootState()), m_machine(machine),
           m_stateCount(0), m_lastIndex(0)
     { }
+//![10]
 
+//![11]
     virtual void onEntry(QEvent *)
     {
         int n;
@@ -115,14 +123,16 @@ public:
         m_machine->postEvent(new StateSwitchEvent(n));
     }
     virtual void onExit(QEvent *) {}
+//![11]
 
+//![12]
     void addState(QState *state, QAbstractAnimation *animation) {
         StateSwitchTransition *trans = new StateSwitchTransition(++m_stateCount);
         trans->setTargetState(state);
         addTransition(trans);
         trans->addAnimation(animation);
     }
-
+//![12]
 
 private:
     QStateMachine *m_machine;
@@ -130,6 +140,7 @@ private:
     int m_lastIndex;
 };
 
+//![13]
 QState *createGeometryState(QObject *w1, const QRect &rect1,
                             QObject *w2, const QRect &rect2,
                             QObject *w3, const QRect &rect3,
@@ -145,6 +156,7 @@ QState *createGeometryState(QObject *w1, const QRect &rect1,
 
     return result;
 }
+//![13]
 
 int main(int argc, char **argv)
 {
@@ -165,6 +177,7 @@ int main(int argc, char **argv)
     button3->setObjectName("button3");
     button4->setObjectName("button4");
 #else
+//![1]
     QGraphicsRectWidget *button1 = new QGraphicsRectWidget;
     QGraphicsRectWidget *button2 = new QGraphicsRectWidget;
     QGraphicsRectWidget *button3 = new QGraphicsRectWidget;
@@ -178,13 +191,14 @@ int main(int argc, char **argv)
     scene.addItem(button2);
     scene.addItem(button3);
     scene.addItem(button4);
-
+//![1]
     QGraphicsView window(&scene);
     window.setFrameStyle(0);
     window.setAlignment(Qt::AlignLeft | Qt::AlignTop);
     window.setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     window.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 #endif
+//![2]
     QStateMachine machine;
 
     QState *group = new QState();
@@ -193,7 +207,9 @@ int main(int argc, char **argv)
     timer.setInterval(1250);
     timer.setSingleShot(true);
     QObject::connect(group, SIGNAL(entered()), &timer, SLOT(start()));
+//![2]
 
+//![3]
     QState *state1;
     QState *state2;
     QState *state3;
@@ -207,6 +223,7 @@ int main(int argc, char **argv)
                                  button3, QRect(200, 0, 50, 50),
                                  button4, QRect(250, 0, 50, 50),
                                  group);
+//![3]
     state2 = createGeometryState(button1, QRect(250, 100, 50, 50),
                                  button2, QRect(250, 150, 50, 50),
                                  button3, QRect(250, 200, 50, 50),
@@ -232,13 +249,16 @@ int main(int argc, char **argv)
                                  button3, QRect(50, 200, 50, 50),
                                  button4, QRect(200, 200, 50, 50),
                                  group);
+//![4]
     state7 = createGeometryState(button1, QRect(0, 0, 50, 50),
                                  button2, QRect(250, 0, 50, 50),
                                  button3, QRect(0, 250, 50, 50),
                                  button4, QRect(250, 250, 50, 50),
                                  group);
     group->setInitialState(state1);
+//![4]
 
+//![5]
     QParallelAnimationGroup animationGroup;
     QSequentialAnimationGroup *subGroup;
 
@@ -246,13 +266,16 @@ int main(int argc, char **argv)
     anim->setDuration(1000);
     anim->setEasingCurve(QEasingCurve::OutElastic);
     animationGroup.addAnimation(anim);
+//![5]
 
+//![6]
     subGroup = new QSequentialAnimationGroup(&animationGroup);
     subGroup->addPause(100);
     anim = new QPropertyAnimation(button3, "geometry");
     anim->setDuration(1000);
     anim->setEasingCurve(QEasingCurve::OutElastic);
     subGroup->addAnimation(anim);
+//![6]
 
     subGroup = new QSequentialAnimationGroup(&animationGroup);
     subGroup->addPause(150);
@@ -268,21 +291,26 @@ int main(int argc, char **argv)
     anim->setEasingCurve(QEasingCurve::OutElastic);
     subGroup->addAnimation(anim);
 
+//![7]
     StateSwitcher *stateSwitcher = new StateSwitcher(&machine);
     stateSwitcher->setObjectName("stateSwitcher");
     group->addTransition(&timer, SIGNAL(timeout()), stateSwitcher);
     stateSwitcher->addState(state1, &animationGroup);
     stateSwitcher->addState(state2, &animationGroup);
+//![7]
     stateSwitcher->addState(state3, &animationGroup);
     stateSwitcher->addState(state4, &animationGroup);
     stateSwitcher->addState(state5, &animationGroup);
     stateSwitcher->addState(state6, &animationGroup);
+//![8]
     stateSwitcher->addState(state7, &animationGroup);
+//![8]
 
+//![9]
     machine.addState(group);
     machine.setInitialState(group);
     machine.start();
-
+//![9]
 
     window.resize(300, 300);
     window.show();
diff --git a/examples/examples.pro b/examples/examples.pro
index bfcf9b4..5382e28 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -22,7 +22,9 @@ SUBDIRS       = \
                 widgets \
                 uitools \
                 xml \
-                script
+                script \
+                multitouch \
+                gestures
 
 contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon
 contains(QT_CONFIG, webkit): SUBDIRS += webkit
diff --git a/examples/gestures/gestures.pro b/examples/gestures/gestures.pro
new file mode 100644
index 0000000..09cd56a
--- /dev/null
+++ b/examples/gestures/gestures.pro
@@ -0,0 +1,10 @@
+TEMPLATE      = \
+              subdirs
+SUBDIRS       = \
+              imageviewer
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/gestures
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS gestures.pro README
+sources.path = $$[QT_INSTALL_EXAMPLES]/gestures
+INSTALLS += target sources
diff --git a/examples/gestures/imageviewer/imageviewer.pro b/examples/gestures/imageviewer/imageviewer.pro
new file mode 100644
index 0000000..4c35dce
--- /dev/null
+++ b/examples/gestures/imageviewer/imageviewer.pro
@@ -0,0 +1,12 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Thu Sep 11 17:18:17 2008
+######################################################################
+
+TEMPLATE = app
+TARGET =
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+HEADERS += imagewidget.h
+SOURCES += imagewidget.cpp main.cpp
diff --git a/examples/gestures/imageviewer/imagewidget.cpp b/examples/gestures/imageviewer/imagewidget.cpp
new file mode 100644
index 0000000..717bb09
--- /dev/null
+++ b/examples/gestures/imageviewer/imagewidget.cpp
@@ -0,0 +1,360 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "imagewidget.h"
+
+#include <QtGui>
+
+ImageWidget::ImageWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    setAttribute(Qt::WA_AcceptTouchEvents);
+    setAttribute(Qt::WA_PaintOnScreen);
+    setAttribute(Qt::WA_OpaquePaintEvent);
+    setAttribute(Qt::WA_NoSystemBackground);
+
+    setObjectName("ImageWidget");
+
+    setMinimumSize(QSize(100,100));
+
+    position = 0;
+    zoomed = rotated = false;
+
+    zoomedIn = false;
+    horizontalOffset = 0;
+    verticalOffset = 0;
+
+    panGesture = new QPanGesture(this);
+    connect(panGesture, SIGNAL(triggered()), this, SLOT(gestureTriggered()));
+
+    tapAndHoldGesture = new QTapAndHoldGesture(this);
+    connect(tapAndHoldGesture, SIGNAL(triggered()), this, SLOT(gestureTriggered()));
+}
+
+void ImageWidget::paintEvent(QPaintEvent*)
+{
+    QPainter p(this);
+    if (currentImage.isNull()) {
+        p.fillRect(geometry(), Qt::white);
+        return;
+    }
+    int hoffset = 0;
+    int voffset = 0;
+    const int w = pixmap.width();
+    const int h = pixmap.height();
+    p.save();
+    if (zoomedIn) {
+        hoffset = horizontalOffset;
+        voffset = verticalOffset;
+        if (horizontalOffset > 0)
+            p.fillRect(0, 0, horizontalOffset, height(), Qt::white);
+        if (verticalOffset > 0)
+            p.fillRect(0, 0, width(), verticalOffset, Qt::white);
+    }
+    p.drawPixmap(hoffset, voffset, pixmap);
+    if (hoffset + w < width())
+        p.fillRect(hoffset + w, 0, width() - w - hoffset, height(), Qt::white);
+    if (voffset + h < height())
+        p.fillRect(0, voffset + h, width(), height() - h - voffset, Qt::white);
+
+    // paint touch feedback
+    if (touchFeedback.tapped || touchFeedback.doubleTapped) {
+        p.setPen(QPen(Qt::gray, 2));
+        p.drawEllipse(touchFeedback.position, 5, 5);
+        if (touchFeedback.doubleTapped) {
+            p.setPen(QPen(Qt::gray, 2, Qt::DotLine));
+            p.drawEllipse(touchFeedback.position, 15, 15);
+        } else if (touchFeedback.tapAndHoldState != 0) {
+            QPoint pts[8] = {
+                touchFeedback.position + QPoint(  0, -15),
+                touchFeedback.position + QPoint( 10, -10),
+                touchFeedback.position + QPoint( 15,   0),
+                touchFeedback.position + QPoint( 10,  10),
+                touchFeedback.position + QPoint(  0,  15),
+                touchFeedback.position + QPoint(-10,  10),
+                touchFeedback.position + QPoint(-15,   0)
+            };
+            for (int i = 0; i < (touchFeedback.tapAndHoldState-20)/10; ++i)
+                p.drawEllipse(pts[i], 3, 3);
+        }
+    } else if (touchFeedback.sliding) {
+        p.setPen(QPen(Qt::red, 3));
+        QPoint endPos = QPoint(touchFeedback.position.x(), touchFeedback.slidingStartPosition.y());
+        p.drawLine(touchFeedback.slidingStartPosition, endPos);
+        int dx = 10;
+        if (touchFeedback.slidingStartPosition.x() < endPos.x())
+            dx = -1*dx;
+        p.drawLine(endPos, endPos + QPoint(dx, 5));
+        p.drawLine(endPos, endPos + QPoint(dx, -5));
+    }
+
+    for (int i = 0; i < TouchFeedback::MaximumNumberOfTouches; ++i) {
+        if (touchFeedback.touches[i].isNull())
+            break;
+        p.drawEllipse(touchFeedback.touches[i], 10, 10);
+    }
+    p.restore();
+}
+
+void ImageWidget::mousePressEvent(QMouseEvent *event)
+{
+    touchFeedback.tapped = true;
+    touchFeedback.position = event->pos();
+}
+
+void ImageWidget::mouseDoubleClickEvent(QMouseEvent *event)
+{
+    touchFeedback.doubleTapped = true;
+    const QPoint p = event->pos();
+    touchFeedback.position = p;
+    horizontalOffset = p.x() - currentImage.width()*1.0*p.x()/width();
+    verticalOffset = p.y() - currentImage.height()*1.0*p.y()/height();
+    setZoomedIn(!zoomedIn);
+    zoomed = rotated = false;
+    updateImage();
+
+    feedbackFadeOutTimer.start(500, this);
+}
+
+void ImageWidget::gestureTriggered()
+{
+    touchFeedback.tapped = false;
+    touchFeedback.doubleTapped = false;
+
+    QGesture *g = qobject_cast<QGesture*>(sender());
+    if (sender() == panGesture) {
+        if (zoomedIn) {
+            // usual panning
+#ifndef QT_NO_CURSOR
+            if (g->state() == Qt::GestureStarted)
+                setCursor(Qt::SizeAllCursor);
+            else
+                setCursor(Qt::ArrowCursor);
+#endif
+            const int dx = g->pos().x() - g->lastPos().x();
+            const int dy = g->pos().y() - g->lastPos().y();
+            horizontalOffset += dx;
+            verticalOffset += dy;
+            update();
+        } else {
+            // only slide gesture should be accepted
+            const QPanGesture *pg = static_cast<const QPanGesture*>(g);
+            if (g->state() == Qt::GestureFinished) {
+                touchFeedback.sliding = false;
+                zoomed = rotated = false;
+                if (pg->totalOffset().width() > 0) {
+                    qDebug() << "slide right";
+                    goNextImage();
+                } else {
+                    qDebug() << "slide left";
+                    goPrevImage();
+                }
+                updateImage();
+            }
+        }
+        feedbackFadeOutTimer.start(500, this);
+    } else if (sender() == tapAndHoldGesture) {
+        if (g->state() == Qt::GestureFinished) {
+            qDebug() << "tap and hold detected";
+            touchFeedback.reset();
+            update();
+
+            QMenu menu;
+            menu.addAction("Action 1");
+            menu.addAction("Action 2");
+            menu.addAction("Action 3");
+            menu.exec(mapToGlobal(g->pos()));
+        }
+        feedbackFadeOutTimer.start(500, this);
+    }
+}
+
+void ImageWidget::gestureFinished()
+{
+    qDebug() << "gesture finished" << sender();
+}
+
+void ImageWidget::gestureCancelled()
+{
+    qDebug() << "gesture cancelled" << sender();
+}
+
+void ImageWidget::resizeEvent(QResizeEvent*)
+{
+    updateImage();
+}
+
+void ImageWidget::updateImage()
+{
+    // should use qtconcurrent here?
+    transformation = QTransform();
+    if (zoomedIn) {
+    } else {
+        if (currentImage.isNull())
+            return;
+        if (zoomed) {
+            transformation = transformation.scale(zoom, zoom);
+        } else {
+            double xscale = (double)width()/currentImage.width();
+            double yscale = (double)height()/currentImage.height();
+            if (xscale < yscale)
+                yscale = xscale;
+            else
+                xscale = yscale;
+            transformation = transformation.scale(xscale, yscale);
+        }
+        if (rotated)
+            transformation = transformation.rotate(angle);
+    }
+    pixmap = QPixmap::fromImage(currentImage).transformed(transformation);
+    update();
+}
+
+void ImageWidget::openDirectory(const QString &path)
+{
+    this->path = path;
+    QDir dir(path);
+    QStringList nameFilters;
+    nameFilters << "*.jpg" << "*.png";
+    files = dir.entryList(nameFilters, QDir::Files|QDir::Readable, QDir::Name);
+
+    position = 0;
+    goToImage(0);
+    updateImage();
+}
+
+QImage ImageWidget::loadImage(const QString &fileName)
+{
+    QImageReader reader(fileName);
+    if (!reader.canRead()) {
+        qDebug() << fileName << ": can't load image";
+        return QImage();
+    }
+    QImage image;
+    if (!reader.read(&image)) {
+        qDebug() << fileName << ": corrupted image";
+        return QImage();
+    }
+    return image;
+}
+
+void ImageWidget::setZoomedIn(bool zoomed)
+{
+    zoomedIn = zoomed;
+}
+
+void ImageWidget::goNextImage()
+{
+    if (files.isEmpty())
+        return;
+    if (position < files.size()-1) {
+        ++position;
+        prevImage = currentImage;
+        currentImage = nextImage;
+        if (position+1 < files.size())
+            nextImage = loadImage(path+QLatin1String("/")+files.at(position+1));
+        else
+            nextImage = QImage();
+    }
+    setZoomedIn(false);
+    updateImage();
+}
+
+void ImageWidget::goPrevImage()
+{
+    if (files.isEmpty())
+        return;
+    if (position > 0) {
+        --position;
+        nextImage = currentImage;
+        currentImage = prevImage;
+        if (position > 0)
+            prevImage = loadImage(path+QLatin1String("/")+files.at(position-1));
+        else
+            prevImage = QImage();
+    }
+    setZoomedIn(false);
+    updateImage();
+}
+
+void ImageWidget::goToImage(int index)
+{
+    if (files.isEmpty())
+        return;
+    if (index < 0 || index >= files.size()) {
+        qDebug() << "goToImage: invalid index: " << index;
+        return;
+    }
+    if (index == position+1) {
+        goNextImage();
+        return;
+    }
+    if (position > 0 && index == position-1) {
+        goPrevImage();
+        return;
+    }
+    position = index;
+    pixmap = QPixmap();
+    if (index > 0)
+        prevImage = loadImage(path+QLatin1String("/")+files.at(position-1));
+    else
+        prevImage = QImage();
+    currentImage = loadImage(path+QLatin1String("/")+files.at(position));
+    if (position+1 < files.size())
+        nextImage = loadImage(path+QLatin1String("/")+files.at(position+1));
+    else
+        nextImage = QImage();
+    setZoomedIn(false);
+    updateImage();
+}
+
+void ImageWidget::timerEvent(QTimerEvent *event)
+{
+    if (event->timerId() == touchFeedback.tapTimer.timerId()) {
+        touchFeedback.tapTimer.stop();
+    } else if (event->timerId() == feedbackFadeOutTimer.timerId()) {
+        feedbackFadeOutTimer.stop();
+        touchFeedback.reset();
+    }
+    update();
+}
+
+#include "moc_imagewidget.cpp"
diff --git a/examples/gestures/imageviewer/imagewidget.h b/examples/gestures/imageviewer/imagewidget.h
new file mode 100644
index 0000000..e12634d
--- /dev/null
+++ b/examples/gestures/imageviewer/imagewidget.h
@@ -0,0 +1,133 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef IMAGEWIDGET_H
+#define IMAGEWIDGET_H
+
+#include <QWidget>
+#include <QImage>
+#include <QPixmap>
+
+#include <QtGui>
+
+class ImageWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    ImageWidget(QWidget *parent = 0);
+
+    void openDirectory(const QString &path);
+
+protected:
+    void paintEvent(QPaintEvent*);
+    void resizeEvent(QResizeEvent*);
+    void timerEvent(QTimerEvent*);
+    void mousePressEvent(QMouseEvent*);
+    void mouseDoubleClickEvent(QMouseEvent*);
+
+private slots:
+    void gestureTriggered();
+    void gestureFinished();
+    void gestureCancelled();
+
+private:
+    void updateImage();
+    QImage loadImage(const QString &fileName);
+    void loadImage();
+    void setZoomedIn(bool zoomed);
+    void goNextImage();
+    void goPrevImage();
+    void goToImage(int index);
+
+    QPanGesture *panGesture;
+    QTapAndHoldGesture *tapAndHoldGesture;
+
+    QString path;
+    QStringList files;
+    int position;
+
+    QImage prevImage, nextImage;
+    QImage currentImage;
+    QPixmap pixmap;
+    QTransform transformation;
+
+    bool zoomedIn;
+    int horizontalOffset;
+    int verticalOffset;
+
+    bool zoomed;
+    qreal zoom;
+    bool rotated;
+    qreal angle;
+
+    struct TouchFeedback
+    {
+        bool tapped;
+        QPoint position;
+        bool sliding;
+        QPoint slidingStartPosition;
+        QBasicTimer tapTimer;
+        int tapState;
+        bool doubleTapped;
+        int tapAndHoldState;
+
+        enum { MaximumNumberOfTouches = 5 };
+        QPoint touches[MaximumNumberOfTouches];
+
+        inline TouchFeedback() { reset(); }
+        inline void reset()
+        {
+            tapped = false;
+            sliding = false;
+            tapTimer.stop();
+            tapState = 0;
+            doubleTapped = false;
+            tapAndHoldState = 0;
+            for (int i = 0; i < MaximumNumberOfTouches; ++i) {
+                touches[i] = QPoint();
+            }
+        }
+    } touchFeedback;
+    QBasicTimer feedbackFadeOutTimer;
+};
+
+#endif
diff --git a/examples/gestures/imageviewer/main.cpp b/examples/gestures/imageviewer/main.cpp
new file mode 100644
index 0000000..6bda418
--- /dev/null
+++ b/examples/gestures/imageviewer/main.cpp
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "imagewidget.h"
+
+class MainWidget : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWidget(QWidget *parent = 0);
+
+public slots:
+    void openDirectory(const QString &path);
+
+private:
+    bool loadImage(const QString &fileName);
+
+    ImageWidget *imageWidget;
+};
+
+MainWidget::MainWidget(QWidget *parent)
+    : QMainWindow(parent)
+{
+    resize(400, 300);
+    imageWidget = new ImageWidget(this);
+    setCentralWidget(imageWidget);
+}
+
+void MainWidget::openDirectory(const QString &path)
+{
+    imageWidget->openDirectory(path);
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    MainWidget w;
+    w.show();
+
+    if (QApplication::arguments().size() > 1)
+        w.openDirectory(QApplication::arguments().at(1));
+    return app.exec();
+}
+
+#include "main.moc"
diff --git a/examples/itemviews/frozencolumn/freezetablewidget.cpp b/examples/itemviews/frozencolumn/freezetablewidget.cpp
index 7a9a8df..4326763 100644
--- a/examples/itemviews/frozencolumn/freezetablewidget.cpp
+++ b/examples/itemviews/frozencolumn/freezetablewidget.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 examples 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/examples/itemviews/frozencolumn/freezetablewidget.h b/examples/itemviews/frozencolumn/freezetablewidget.h
index 2abae47..e22660e 100644
--- a/examples/itemviews/frozencolumn/freezetablewidget.h
+++ b/examples/itemviews/frozencolumn/freezetablewidget.h
@@ -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 examples 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/examples/itemviews/frozencolumn/main.cpp b/examples/itemviews/frozencolumn/main.cpp
index fdefd73..8ed9d3b 100644
--- a/examples/itemviews/frozencolumn/main.cpp
+++ b/examples/itemviews/frozencolumn/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 examples 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/examples/multitouch/dials/dials.pro b/examples/multitouch/dials/dials.pro
new file mode 100644
index 0000000..e592232
--- /dev/null
+++ b/examples/multitouch/dials/dials.pro
@@ -0,0 +1,2 @@
+SOURCES += main.cpp
+FORMS += dials.ui
diff --git a/examples/multitouch/dials/dials.ui b/examples/multitouch/dials/dials.ui
new file mode 100644
index 0000000..8ca7ae9
--- /dev/null
+++ b/examples/multitouch/dials/dials.ui
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Dials</class>
+ <widget class="QWidget" name="Dials">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QDial" name="dial_1">
+     <property name="notchesVisible">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QDial" name="dial_2">
+     <property name="notchesVisible">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2">
+    <widget class="QDial" name="dial_3">
+     <property name="notchesVisible">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="3">
+    <widget class="QDial" name="dial_4">
+     <property name="notchesVisible">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QDial" name="dial_5">
+     <property name="notchesVisible">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QDial" name="dial_6">
+     <property name="notchesVisible">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QDial" name="dial_7">
+     <property name="notchesVisible">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="3">
+    <widget class="QDial" name="dial_8">
+     <property name="notchesVisible">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/examples/multitouch/dials/main.cpp b/examples/multitouch/dials/main.cpp
new file mode 100644
index 0000000..fbc29f6
--- /dev/null
+++ b/examples/multitouch/dials/main.cpp
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QWidget>
+#include <QDial>
+
+#include "ui_dials.h"
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    QWidget window;
+    Ui::Dials dialsUi;
+    dialsUi.setupUi(&window);
+    QList<QAbstractSlider *> sliders = window.findChildren<QAbstractSlider *>();
+    foreach (QAbstractSlider *slider, sliders)
+        slider->setAttribute(Qt::WA_AcceptTouchEvents);
+    window.showMaximized();
+    return app.exec();
+}
diff --git a/examples/multitouch/fingerpaint/fingerpaint.pro b/examples/multitouch/fingerpaint/fingerpaint.pro
new file mode 100644
index 0000000..1d45635
--- /dev/null
+++ b/examples/multitouch/fingerpaint/fingerpaint.pro
@@ -0,0 +1,11 @@
+HEADERS       = mainwindow.h \
+                scribblearea.h
+SOURCES       = main.cpp \
+                mainwindow.cpp \
+                scribblearea.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/multitouch/fingerpaint
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fingerpaint.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/multitouch/fingerpaint
+INSTALLS += target sources
diff --git a/examples/multitouch/fingerpaint/main.cpp b/examples/multitouch/fingerpaint/main.cpp
new file mode 100644
index 0000000..17bca5f
--- /dev/null
+++ b/examples/multitouch/fingerpaint/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow window;
+    window.showMaximized();
+    return app.exec();
+}
diff --git a/examples/multitouch/fingerpaint/mainwindow.cpp b/examples/multitouch/fingerpaint/mainwindow.cpp
new file mode 100644
index 0000000..a710d55
--- /dev/null
+++ b/examples/multitouch/fingerpaint/mainwindow.cpp
@@ -0,0 +1,218 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+#include "scribblearea.h"
+
+//! [0]
+MainWindow::MainWindow()
+{
+    scribbleArea = new ScribbleArea;
+    setCentralWidget(scribbleArea);
+
+    createActions();
+    createMenus();
+
+    setWindowTitle(tr("Finger Paint"));
+    resize(500, 500);
+}
+//! [0]
+
+//! [1]
+void MainWindow::closeEvent(QCloseEvent *event)
+//! [1] //! [2]
+{
+    if (maybeSave()) {
+        event->accept();
+    } else {
+        event->ignore();
+    }
+}
+//! [2]
+
+//! [3]
+void MainWindow::open()
+//! [3] //! [4]
+{
+    if (maybeSave()) {
+        QString fileName = QFileDialog::getOpenFileName(this,
+                                   tr("Open File"), QDir::currentPath());
+        if (!fileName.isEmpty())
+            scribbleArea->openImage(fileName);
+    }
+}
+//! [4]
+
+//! [5]
+void MainWindow::save()
+//! [5] //! [6]
+{
+    QAction *action = qobject_cast<QAction *>(sender());
+    QByteArray fileFormat = action->data().toByteArray();
+    saveFile(fileFormat);
+}
+//! [6]
+
+//! [11]
+void MainWindow::about()
+//! [11] //! [12]
+{
+    QMessageBox::about(this, tr("About Scribble"),
+            tr("<p>The <b>Scribble</b> example shows how to use QMainWindow as the "
+               "base widget for an application, and how to reimplement some of "
+               "QWidget's event handlers to receive the events generated for "
+               "the application's widgets:</p><p> We reimplement the mouse event "
+               "handlers to facilitate drawing, the paint event handler to "
+               "update the application and the resize event handler to optimize "
+               "the application's appearance. In addition we reimplement the "
+               "close event handler to intercept the close events before "
+               "terminating the application.</p><p> The example also demonstrates "
+               "how to use QPainter to draw an image in real time, as well as "
+               "to repaint widgets.</p>"));
+}
+//! [12]
+
+//! [13]
+void MainWindow::createActions()
+//! [13] //! [14]
+{
+    openAct = new QAction(tr("&Open..."), this);
+    openAct->setShortcut(tr("Ctrl+O"));
+    connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
+
+    foreach (QByteArray format, QImageWriter::supportedImageFormats()) {
+        QString text = tr("%1...").arg(QString(format).toUpper());
+
+        QAction *action = new QAction(text, this);
+        action->setData(format);
+        connect(action, SIGNAL(triggered()), this, SLOT(save()));
+        saveAsActs.append(action);
+    }
+
+    printAct = new QAction(tr("&Print..."), this);
+    connect(printAct, SIGNAL(triggered()), scribbleArea, SLOT(print()));
+
+    exitAct = new QAction(tr("E&xit"), this);
+    exitAct->setShortcut(tr("Ctrl+Q"));
+    connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
+
+    clearScreenAct = new QAction(tr("&Clear Screen"), this);
+    clearScreenAct->setShortcut(tr("Ctrl+L"));
+    connect(clearScreenAct, SIGNAL(triggered()),
+            scribbleArea, SLOT(clearImage()));
+
+    aboutAct = new QAction(tr("&About"), this);
+    connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
+
+    aboutQtAct = new QAction(tr("About &Qt"), this);
+    connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+}
+//! [14]
+
+//! [15]
+void MainWindow::createMenus()
+//! [15] //! [16]
+{
+    saveAsMenu = new QMenu(tr("&Save As"), this);
+    foreach (QAction *action, saveAsActs)
+        saveAsMenu->addAction(action);
+
+    fileMenu = new QMenu(tr("&File"), this);
+    fileMenu->addAction(openAct);
+    fileMenu->addMenu(saveAsMenu);
+    fileMenu->addAction(printAct);
+    fileMenu->addSeparator();
+    fileMenu->addAction(exitAct);
+
+    optionMenu = new QMenu(tr("&Options"), this);
+    optionMenu->addAction(clearScreenAct);
+
+    helpMenu = new QMenu(tr("&Help"), this);
+    helpMenu->addAction(aboutAct);
+    helpMenu->addAction(aboutQtAct);
+
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(optionMenu);
+    menuBar()->addMenu(helpMenu);
+}
+//! [16]
+
+//! [17]
+bool MainWindow::maybeSave()
+//! [17] //! [18]
+{
+    if (scribbleArea->isModified()) {
+       QMessageBox::StandardButton ret;
+       ret = QMessageBox::warning(this, tr("Scribble"),
+                          tr("The image has been modified.\n"
+                             "Do you want to save your changes?"),
+                          QMessageBox::Save | QMessageBox::Discard
+			  | QMessageBox::Cancel);
+        if (ret == QMessageBox::Save) {
+            return saveFile("png");
+        } else if (ret == QMessageBox::Cancel) {
+            return false;
+        }
+    }
+    return true;
+}
+//! [18]
+
+//! [19]
+bool MainWindow::saveFile(const QByteArray &fileFormat)
+//! [19] //! [20]
+{
+    QString initialPath = QDir::currentPath() + "/untitled." + fileFormat;
+
+    QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"),
+                               initialPath,
+                               tr("%1 Files (*.%2);;All Files (*)")
+                               .arg(QString(fileFormat.toUpper()))
+                               .arg(QString(fileFormat)));
+    if (fileName.isEmpty()) {
+        return false;
+    } else {
+        return scribbleArea->saveImage(fileName, fileFormat);
+    }
+}
+//! [20]
diff --git a/examples/multitouch/fingerpaint/mainwindow.h b/examples/multitouch/fingerpaint/mainwindow.h
new file mode 100644
index 0000000..7ece416
--- /dev/null
+++ b/examples/multitouch/fingerpaint/mainwindow.h
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QList>
+#include <QMainWindow>
+
+class ScribbleArea;
+
+//! [0]
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+protected:
+    void closeEvent(QCloseEvent *event);
+
+private slots:
+    void open();
+    void save();
+    void about();
+
+private:
+    void createActions();
+    void createMenus();
+    bool maybeSave();
+    bool saveFile(const QByteArray &fileFormat);
+
+    ScribbleArea *scribbleArea;
+
+    QMenu *saveAsMenu;
+    QMenu *fileMenu;
+    QMenu *optionMenu;
+    QMenu *helpMenu;
+
+    QAction *openAct;
+    QList<QAction *> saveAsActs;
+    QAction *exitAct;
+    QAction *printAct;
+    QAction *clearScreenAct;
+    QAction *aboutAct;
+    QAction *aboutQtAct;
+};
+//! [0]
+
+#endif
diff --git a/examples/multitouch/fingerpaint/scribblearea.cpp b/examples/multitouch/fingerpaint/scribblearea.cpp
new file mode 100644
index 0000000..98dedce
--- /dev/null
+++ b/examples/multitouch/fingerpaint/scribblearea.cpp
@@ -0,0 +1,212 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "scribblearea.h"
+
+//! [0]
+ScribbleArea::ScribbleArea(QWidget *parent)
+    : QWidget(parent)
+{
+    setAttribute(Qt::WA_AcceptTouchEvents);
+    setAttribute(Qt::WA_StaticContents);
+    modified = false;
+
+    myPenColors
+            << QColor("green")
+            << QColor("purple")
+            << QColor("red")
+            << QColor("blue")
+            << QColor("yellow")
+
+            << QColor("pink")
+            << QColor("orange")
+            << QColor("brown")
+            << QColor("grey")
+            << QColor("black");
+}
+//! [0]
+
+//! [1]
+bool ScribbleArea::openImage(const QString &fileName)
+//! [1] //! [2]
+{
+    QImage loadedImage;
+    if (!loadedImage.load(fileName))
+        return false;
+
+    QSize newSize = loadedImage.size().expandedTo(size());
+    resizeImage(&loadedImage, newSize);
+    image = loadedImage;
+    modified = false;
+    update();
+    return true;
+}
+//! [2]
+
+//! [3]
+bool ScribbleArea::saveImage(const QString &fileName, const char *fileFormat)
+//! [3] //! [4]
+{
+    QImage visibleImage = image;
+    resizeImage(&visibleImage, size());
+
+    if (visibleImage.save(fileName, fileFormat)) {
+        modified = false;
+        return true;
+    } else {
+        return false;
+    }
+}
+//! [4]
+
+//! [9]
+void ScribbleArea::clearImage()
+//! [9] //! [10]
+{
+    image.fill(qRgb(255, 255, 255));
+    modified = true;
+    update();
+}
+//! [10]
+
+//! [12] //! [13]
+void ScribbleArea::paintEvent(QPaintEvent *event)
+//! [13] //! [14]
+{
+    QPainter painter(this);
+    const QRect rect = event->rect();
+    painter.drawImage(rect.topLeft(), image, rect);
+}
+//! [14]
+
+//! [15]
+void ScribbleArea::resizeEvent(QResizeEvent *event)
+//! [15] //! [16]
+{
+    if (width() > image.width() || height() > image.height()) {
+        int newWidth = qMax(width() + 128, image.width());
+        int newHeight = qMax(height() + 128, image.height());
+        resizeImage(&image, QSize(newWidth, newHeight));
+        update();
+    }
+    QWidget::resizeEvent(event);
+}
+//! [16]
+
+//! [19]
+void ScribbleArea::resizeImage(QImage *image, const QSize &newSize)
+//! [19] //! [20]
+{
+    if (image->size() == newSize)
+        return;
+
+    QImage newImage(newSize, QImage::Format_RGB32);
+    newImage.fill(qRgb(255, 255, 255));
+    QPainter painter(&newImage);
+    painter.drawImage(QPoint(0, 0), *image);
+    *image = newImage;
+}
+//! [20]
+
+//! [21]
+void ScribbleArea::print()
+{
+#ifndef QT_NO_PRINTER
+    QPrinter printer(QPrinter::HighResolution);
+
+    QPrintDialog *printDialog = new QPrintDialog(&printer, this);
+//! [21] //! [22]
+    if (printDialog->exec() == QDialog::Accepted) {
+        QPainter painter(&printer);
+        QRect rect = painter.viewport();
+        QSize size = image.size();
+        size.scale(rect.size(), Qt::KeepAspectRatio);
+        painter.setViewport(rect.x(), rect.y(), size.width(), size.height());
+        painter.setWindow(image.rect());
+        painter.drawImage(0, 0, image);
+    }
+#endif // QT_NO_PRINTER
+}
+//! [22]
+
+bool ScribbleArea::event(QEvent *event)
+{
+    switch (event->type()) {
+    case QEvent::TouchBegin:
+    case QEvent::TouchUpdate:
+    case QEvent::TouchEnd:
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints = static_cast<QTouchEvent *>(event)->touchPoints();
+        foreach (const QTouchEvent::TouchPoint &touchPoint, touchPoints) {
+            switch (touchPoint.state()) {
+            case Qt::TouchPointStationary:
+                // don't do anything if this touch point hasn't moved
+                continue;
+            default:
+                {
+                    QRectF rect = touchPoint.rect();
+                    if (rect.isEmpty()) {
+                        qreal diameter = qreal(50) * touchPoint.pressure();
+                        rect.setSize(QSizeF(diameter, diameter));
+                    }
+
+                    QPainter painter(&image);
+                    painter.setPen(Qt::NoPen);
+                    painter.setBrush(myPenColors.at(touchPoint.id() % myPenColors.count()));
+                    painter.drawEllipse(rect);
+                    painter.end();
+
+                    modified = true;
+                    int rad = 2;
+                    update(rect.toRect().adjusted(-rad,-rad, +rad, +rad));
+                }
+                break;
+            }
+        }
+        break;
+    }
+    default:
+        return QWidget::event(event);
+    }
+    return true;
+}
diff --git a/examples/multitouch/fingerpaint/scribblearea.h b/examples/multitouch/fingerpaint/scribblearea.h
new file mode 100644
index 0000000..11e8e58
--- /dev/null
+++ b/examples/multitouch/fingerpaint/scribblearea.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SCRIBBLEAREA_H
+#define SCRIBBLEAREA_H
+
+#include <QColor>
+#include <QImage>
+#include <QPoint>
+#include <QWidget>
+
+//! [0]
+class ScribbleArea : public QWidget
+{
+    Q_OBJECT
+
+public:
+    ScribbleArea(QWidget *parent = 0);
+
+    bool openImage(const QString &fileName);
+    bool saveImage(const QString &fileName, const char *fileFormat);
+
+    bool isModified() const { return modified; }
+
+public slots:
+    void clearImage();
+    void print();
+
+protected:
+    void paintEvent(QPaintEvent *event);
+    void resizeEvent(QResizeEvent *event);
+    bool event(QEvent *event);
+
+private:
+    void resizeImage(QImage *image, const QSize &newSize);
+
+    bool modified;
+    QList<QColor> myPenColors;
+    QImage image;
+};
+//! [0]
+
+#endif
diff --git a/examples/multitouch/knobs/knob.cpp b/examples/multitouch/knobs/knob.cpp
new file mode 100644
index 0000000..68be529
--- /dev/null
+++ b/examples/multitouch/knobs/knob.cpp
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "knob.h"
+
+#include <QBrush>
+#include <QTouchEvent>
+
+Knob::Knob()
+    : QGraphicsEllipseItem(-50, -50, 100, 100)
+{
+    setAcceptTouchEvents(true);
+    setBrush(Qt::lightGray);
+
+    QGraphicsEllipseItem *leftItem = new QGraphicsEllipseItem(0, 0, 20, 20, this);
+    leftItem->setPos(-40, -10);
+    leftItem->setBrush(Qt::darkGreen);
+
+    QGraphicsEllipseItem *rightItem = new QGraphicsEllipseItem(0, 0, 20, 20, this);
+    rightItem->setPos(20, -10);
+    rightItem->setBrush(Qt::darkRed);
+}
+
+bool Knob::sceneEvent(QEvent *event)
+{
+    switch (event->type()) {
+    case QEvent::TouchBegin:
+    case QEvent::TouchUpdate:
+    case QEvent::TouchEnd:
+    {
+        QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
+
+        if (touchEvent->touchPoints().count() == 2) {
+            const QTouchEvent::TouchPoint &touchPoint1 = touchEvent->touchPoints().first();
+            const QTouchEvent::TouchPoint &touchPoint2 = touchEvent->touchPoints().last();
+
+            QLineF line1(touchPoint1.lastScenePos(), touchPoint2.lastScenePos());
+            QLineF line2(touchPoint1.scenePos(), touchPoint2.scenePos());
+
+            rotate(line2.angleTo(line1));
+        }
+
+        break;
+    }
+
+    default:
+        return QGraphicsItem::sceneEvent(event);
+    }
+
+    return true;
+}
diff --git a/examples/multitouch/knobs/knob.h b/examples/multitouch/knobs/knob.h
new file mode 100644
index 0000000..74fcd15
--- /dev/null
+++ b/examples/multitouch/knobs/knob.h
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef KNOB_H
+#define KNOB_H
+
+#include <QGraphicsItem>
+
+class Knob : public QGraphicsEllipseItem
+{
+public:
+    Knob();
+
+    bool sceneEvent(QEvent *event);
+};
+
+#endif // KNOB_H
diff --git a/examples/multitouch/knobs/knobs.pro b/examples/multitouch/knobs/knobs.pro
new file mode 100644
index 0000000..90f0ba5
--- /dev/null
+++ b/examples/multitouch/knobs/knobs.pro
@@ -0,0 +1,2 @@
+HEADERS = knob.h
+SOURCES = main.cpp knob.cpp
diff --git a/examples/multitouch/knobs/main.cpp b/examples/multitouch/knobs/main.cpp
new file mode 100644
index 0000000..84fc0ba
--- /dev/null
+++ b/examples/multitouch/knobs/main.cpp
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QGraphicsView>
+
+#include "knob.h"
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    QGraphicsScene scene;
+    QGraphicsView view(&scene);
+
+    Knob *knob1 = new Knob;
+    knob1->setPos(-110, 0);
+    Knob *knob2 = new Knob;
+
+    scene.addItem(knob1);
+    scene.addItem(knob2);
+
+    view.showMaximized();
+    view.fitInView(scene.sceneRect().adjusted(-20, -20, 20, 20), Qt::KeepAspectRatio);
+
+    return app.exec();
+}
diff --git a/examples/multitouch/multitouch.pro b/examples/multitouch/multitouch.pro
new file mode 100644
index 0000000..d5983eb
--- /dev/null
+++ b/examples/multitouch/multitouch.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS = pinchzoom fingerpaint knobs dials
diff --git a/examples/multitouch/pinchzoom/graphicsview.cpp b/examples/multitouch/pinchzoom/graphicsview.cpp
new file mode 100644
index 0000000..ca2f519
--- /dev/null
+++ b/examples/multitouch/pinchzoom/graphicsview.cpp
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "graphicsview.h"
+
+#include <QScrollBar>
+#include <QTouchEvent>
+
+GraphicsView::GraphicsView(QGraphicsScene *scene, QWidget *parent)
+    : QGraphicsView(scene, parent)
+{
+    setAttribute(Qt::WA_AcceptTouchEvents);
+    setDragMode(ScrollHandDrag);
+}
+
+bool GraphicsView::event(QEvent *event)
+{
+    switch (event->type()) {
+    case QEvent::TouchBegin:
+    case QEvent::TouchUpdate:
+    case QEvent::TouchEnd:
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints = static_cast<QTouchEvent *>(event)->touchPoints();
+        if (touchPoints.count() == 2) {
+            // determine scale factor
+            const QTouchEvent::TouchPoint &touchPoint0 = touchPoints.first();
+            const QTouchEvent::TouchPoint &touchPoint1 = touchPoints.last();
+            const qreal scaleFactor = QLineF(touchPoint0.pos(), touchPoint1.pos()).length()
+                                      / QLineF(touchPoint0.startPos(), touchPoint1.startPos()).length();
+            setTransform(QTransform().scale(scaleFactor, scaleFactor));
+        }
+        return true;
+    }
+    default:
+        break;
+    }
+    return QGraphicsView::event(event);
+}
diff --git a/examples/multitouch/pinchzoom/graphicsview.h b/examples/multitouch/pinchzoom/graphicsview.h
new file mode 100644
index 0000000..5ab586f
--- /dev/null
+++ b/examples/multitouch/pinchzoom/graphicsview.h
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#pragma once
+#include <QGraphicsView>
+
+class GraphicsView : public QGraphicsView
+{
+    Q_OBJECT
+
+public:
+    GraphicsView(QGraphicsScene *scene = 0, QWidget *parent = 0);
+
+    bool event(QEvent *event);
+};
diff --git a/examples/multitouch/pinchzoom/images/cheese.jpg b/examples/multitouch/pinchzoom/images/cheese.jpg
new file mode 100644
index 0000000..dea5795
--- /dev/null
+++ b/examples/multitouch/pinchzoom/images/cheese.jpg
diff --git a/examples/multitouch/pinchzoom/main.cpp b/examples/multitouch/pinchzoom/main.cpp
new file mode 100644
index 0000000..400008a
--- /dev/null
+++ b/examples/multitouch/pinchzoom/main.cpp
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "graphicsview.h"
+#include "mouse.h"
+
+#include <QtGui>
+
+#include <math.h>
+
+static const int MouseCount = 7;
+
+//! [0]
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
+//! [0]
+
+//! [1]
+    QGraphicsScene scene;
+    scene.setSceneRect(-300, -300, 600, 600);
+//! [1] //! [2]
+    scene.setItemIndexMethod(QGraphicsScene::NoIndex);
+//! [2]
+
+//! [3]
+    for (int i = 0; i < MouseCount; ++i) {
+        Mouse *mouse = new Mouse;
+        mouse->setPos(::sin((i * 6.28) / MouseCount) * 200,
+                      ::cos((i * 6.28) / MouseCount) * 200);
+        scene.addItem(mouse);
+    }
+//! [3]
+
+//! [4]
+    GraphicsView view(&scene);
+    view.setRenderHint(QPainter::Antialiasing);
+    view.setBackgroundBrush(QPixmap(":/images/cheese.jpg"));
+//! [4] //! [5]
+    view.setCacheMode(QGraphicsView::CacheBackground);
+    view.setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
+//! [5] //! [6]
+    view.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Colliding Mice"));
+    view.showMaximized();
+
+    return app.exec();
+}
+//! [6]
diff --git a/examples/multitouch/pinchzoom/mice.qrc b/examples/multitouch/pinchzoom/mice.qrc
new file mode 100644
index 0000000..accdb4d
--- /dev/null
+++ b/examples/multitouch/pinchzoom/mice.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/" >
+        <file>images/cheese.jpg</file>
+    </qresource>
+</RCC>
diff --git a/examples/multitouch/pinchzoom/mouse.cpp b/examples/multitouch/pinchzoom/mouse.cpp
new file mode 100644
index 0000000..256811a
--- /dev/null
+++ b/examples/multitouch/pinchzoom/mouse.cpp
@@ -0,0 +1,200 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mouse.h"
+
+#include <QGraphicsScene>
+#include <QPainter>
+#include <QStyleOption>
+
+#include <math.h>
+
+static const double Pi = 3.14159265358979323846264338327950288419717;
+static double TwoPi = 2.0 * Pi;
+
+static qreal normalizeAngle(qreal angle)
+{
+    while (angle < 0)
+        angle += TwoPi;
+    while (angle > TwoPi)
+        angle -= TwoPi;
+    return angle;
+}
+
+//! [0]
+Mouse::Mouse()
+    : angle(0), speed(0), mouseEyeDirection(0),
+      color(qrand() % 256, qrand() % 256, qrand() % 256)
+{
+    rotate(qrand() % (360 * 16));
+    startTimer(1000 / 33);
+}
+//! [0]
+
+//! [1]
+QRectF Mouse::boundingRect() const
+{
+    qreal adjust = 0.5;
+    return QRectF(-18 - adjust, -22 - adjust,
+                  36 + adjust, 60 + adjust);
+}
+//! [1]
+
+//! [2]
+QPainterPath Mouse::shape() const
+{
+    QPainterPath path;
+    path.addRect(-10, -20, 20, 40);
+    return path;
+}
+//! [2]
+
+//! [3]
+void Mouse::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
+{
+    // Body
+    painter->setBrush(color);
+    painter->drawEllipse(-10, -20, 20, 40);
+
+    // Eyes
+    painter->setBrush(Qt::white);
+    painter->drawEllipse(-10, -17, 8, 8);
+    painter->drawEllipse(2, -17, 8, 8);
+
+    // Nose
+    painter->setBrush(Qt::black);
+    painter->drawEllipse(QRectF(-2, -22, 4, 4));
+
+    // Pupils
+    painter->drawEllipse(QRectF(-8.0 + mouseEyeDirection, -17, 4, 4));
+    painter->drawEllipse(QRectF(4.0 + mouseEyeDirection, -17, 4, 4));
+
+    // Ears
+    painter->setBrush(scene()->collidingItems(this).isEmpty() ? Qt::darkYellow : Qt::red);
+    painter->drawEllipse(-17, -12, 16, 16);
+    painter->drawEllipse(1, -12, 16, 16);
+
+    // Tail
+    QPainterPath path(QPointF(0, 20));
+    path.cubicTo(-5, 22, -5, 22, 0, 25);
+    path.cubicTo(5, 27, 5, 32, 0, 30);
+    path.cubicTo(-5, 32, -5, 42, 0, 35);
+    painter->setBrush(Qt::NoBrush);
+    painter->drawPath(path);
+}
+//! [3]
+
+//! [4]
+void Mouse::timerEvent(QTimerEvent *)
+{
+//! [4]
+    // Don't move too far away
+//! [5]
+    QLineF lineToCenter(QPointF(0, 0), mapFromScene(0, 0));
+    if (lineToCenter.length() > 150) {
+        qreal angleToCenter = ::acos(lineToCenter.dx() / lineToCenter.length());
+        if (lineToCenter.dy() < 0)
+            angleToCenter = TwoPi - angleToCenter;
+        angleToCenter = normalizeAngle((Pi - angleToCenter) + Pi / 2);
+
+        if (angleToCenter < Pi && angleToCenter > Pi / 4) {
+            // Rotate left
+            angle += (angle < -Pi / 2) ? 0.25 : -0.25;
+        } else if (angleToCenter >= Pi && angleToCenter < (Pi + Pi / 2 + Pi / 4)) {
+            // Rotate right
+            angle += (angle < Pi / 2) ? 0.25 : -0.25;
+        }
+    } else if (::sin(angle) < 0) {
+        angle += 0.25;
+    } else if (::sin(angle) > 0) {
+        angle -= 0.25;
+//! [5] //! [6]
+    }
+//! [6]
+
+    // Try not to crash with any other mice
+//! [7]
+    QList<QGraphicsItem *> dangerMice = scene()->items(QPolygonF()
+                                                       << mapToScene(0, 0)
+                                                       << mapToScene(-30, -50)
+                                                       << mapToScene(30, -50));
+    foreach (QGraphicsItem *item, dangerMice) {
+        if (item == this)
+            continue;
+        
+        QLineF lineToMouse(QPointF(0, 0), mapFromItem(item, 0, 0));
+        qreal angleToMouse = ::acos(lineToMouse.dx() / lineToMouse.length());
+        if (lineToMouse.dy() < 0)
+            angleToMouse = TwoPi - angleToMouse;
+        angleToMouse = normalizeAngle((Pi - angleToMouse) + Pi / 2);
+
+        if (angleToMouse >= 0 && angleToMouse < Pi / 2) {
+            // Rotate right
+            angle += 0.5;
+        } else if (angleToMouse <= TwoPi && angleToMouse > (TwoPi - Pi / 2)) {
+            // Rotate left
+            angle -= 0.5;
+//! [7] //! [8]
+        }
+//! [8] //! [9]
+    }
+//! [9]
+
+    // Add some random movement
+//! [10]
+    if (dangerMice.size() > 1 && (qrand() % 10) == 0) {
+        if (qrand() % 1)
+            angle += (qrand() % 100) / 500.0;
+        else
+            angle -= (qrand() % 100) / 500.0;
+    }
+//! [10]
+
+//! [11]
+    speed += (-50 + qrand() % 100) / 100.0;
+
+    qreal dx = ::sin(angle) * 10;
+    mouseEyeDirection = (qAbs(dx / 5) < 1) ? 0 : dx / 5;
+
+    rotate(dx);
+    setPos(mapToParent(0, -(3 + sin(speed) * 3)));
+}
+//! [11]
diff --git a/examples/multitouch/pinchzoom/mouse.h b/examples/multitouch/pinchzoom/mouse.h
new file mode 100644
index 0000000..6c8486f
--- /dev/null
+++ b/examples/multitouch/pinchzoom/mouse.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MOUSE_H
+#define MOUSE_H
+
+#include <QGraphicsItem>
+#include <QObject>
+
+//! [0]
+class Mouse : public QObject, public QGraphicsItem
+{
+    Q_OBJECT
+
+public:
+    Mouse();
+
+    QRectF boundingRect() const;
+    QPainterPath shape() const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+               QWidget *widget);
+
+protected:
+    void timerEvent(QTimerEvent *event);
+
+private:
+    qreal angle;
+    qreal speed;
+    qreal mouseEyeDirection;
+    QColor color;
+};
+//! [0]
+
+#endif
diff --git a/examples/multitouch/pinchzoom/pinchzoom.pro b/examples/multitouch/pinchzoom/pinchzoom.pro
new file mode 100644
index 0000000..bd87cf7
--- /dev/null
+++ b/examples/multitouch/pinchzoom/pinchzoom.pro
@@ -0,0 +1,16 @@
+HEADERS += \
+        mouse.h \
+        graphicsview.h
+SOURCES += \
+	main.cpp \
+        mouse.cpp \
+        graphicsview.cpp
+
+RESOURCES += \
+	mice.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/multitouch/pinchzoom
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS pinchzoom.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/multitouch/pinchzoom
+INSTALLS += target sources
diff --git a/examples/opengl/hellogl_es2/glwidget.cpp b/examples/opengl/hellogl_es2/glwidget.cpp
index 6b08662..bb07b22 100644
--- a/examples/opengl/hellogl_es2/glwidget.cpp
+++ b/examples/opengl/hellogl_es2/glwidget.cpp
@@ -41,6 +41,7 @@
 
 #include "glwidget.h"
 #include <QPainter>
+#include <QPaintEngine>
 #include <math.h>
 
 #include "bubble.h"
@@ -265,6 +266,8 @@ void GLWidget::paintGL()
     QPainter painter;
     painter.begin(this);
 
+    painter.paintEngine()->syncState();
+
     glClearColor(0.1f, 0.1f, 0.2f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     glEnable(GL_TEXTURE_2D);
diff --git a/examples/tools/codecs/encodedfiles/.gitattributes b/examples/tools/codecs/encodedfiles/.gitattributes
deleted file mode 100644
index 996aab2..0000000
--- a/examples/tools/codecs/encodedfiles/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-iso-8859-15.txt -crlf
-iso-8859-1.txt -crlf
diff --git a/examples/tools/codecs/encodedfiles/iso-8859-1.txt b/examples/tools/codecs/encodedfiles/iso-8859-1.txt
index 4a7ebe3..d7fcaca 100644
--- a/examples/tools/codecs/encodedfiles/iso-8859-1.txt
+++ b/examples/tools/codecs/encodedfiles/iso-8859-1.txt
@@ -1,6 +1,6 @@
-Paulo Coelho: O Gênio e as Rosas

-Anna Hallström, Urban Östberg: Svår svenska

-Darrell Huff: How to Lie with Statistics

-Franz Kafka: Das Schloß

-Walter Moers: Die 13½ Leben des Käpt'n Blaubär

-Dag Solstad: Forsøk på å beskrive det ugjennomtrengelige

+Paulo Coelho: O Gênio e as Rosas
+Anna Hallström, Urban Östberg: Svår svenska
+Darrell Huff: How to Lie with Statistics
+Franz Kafka: Das Schloß
+Walter Moers: Die 13½ Leben des Käpt'n Blaubär
+Dag Solstad: Forsøk på å beskrive det ugjennomtrengelige
diff --git a/examples/tools/codecs/encodedfiles/iso-8859-15.txt b/examples/tools/codecs/encodedfiles/iso-8859-15.txt
index cd43ea3..be2d83c 100644
--- a/examples/tools/codecs/encodedfiles/iso-8859-15.txt
+++ b/examples/tools/codecs/encodedfiles/iso-8859-15.txt
@@ -1,8 +1,8 @@
-Paulo Coelho: O Gênio e as Rosas

-Jean-Pierre Coffe: À table en famille avec 15 ¤ par jour

-Anna Hallström, Urban Östberg: Svår svenska

-Darrell Huff: How to Lie with Statistics

-Franz Kafka: Das Schloß

-Helena Lehecková: T¨ekkiä suomalaisille

-Arthur Rimbaud: ¼uvres complètes

-Dag Solstad: Forsøk på å beskrive det ugjennomtrengelige

+Paulo Coelho: O Gênio e as Rosas
+Jean-Pierre Coffe: À table en famille avec 15 ¤ par jour
+Anna Hallström, Urban Östberg: Svår svenska
+Darrell Huff: How to Lie with Statistics
+Franz Kafka: Das Schloß
+Helena Lehecková: T¨ekkiä suomalaisille
+Arthur Rimbaud: ¼uvres complètes
+Dag Solstad: Forsøk på å beskrive det ugjennomtrengelige
diff --git a/examples/uitools/textfinder/forms/input.txt b/examples/uitools/textfinder/forms/input.txt
index fae542f..29dfe5d 100644
--- a/examples/uitools/textfinder/forms/input.txt
+++ b/examples/uitools/textfinder/forms/input.txt
@@ -1,5 +1,5 @@
 These forms are processed at run-time to produce dynamically-generated user interfaces. 
-In order to generate a form at run-time, a resource file containing a .ui file is needed. 
+In order to generate a form at run-time, a resource file containing a UI file is needed. 
 Applications that use the form handling classes need to be configured to be built against 
 the QtUiTools module. This is done by including the following declaration in a qmake project 
 file to ensure that the application is compiled and linked appropriately. A form loader object,