Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	mkspecs/features/qt.prf
	src/corelib/animation/qanimationgroup.cpp
	src/corelib/animation/qparallelanimationgroup.cpp
	src/corelib/animation/qpauseanimation.cpp
	src/corelib/animation/qpropertyanimation.cpp
	src/corelib/animation/qsequentialanimationgroup.cpp
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qvariant_p.h
	src/corelib/tools/qeasingcurve.cpp
	src/gui/graphicsview/qgraphicsitem.cpp
	src/opengl/opengl.pro
	src/opengl/qgl_x11egl.cpp
	tests/auto/auto.pro

9 files changed, 110 insertions, 2 deletions

diff --git a/doc/src/snippets/animation/sequential/icons.qrc b/doc/src/snippets/animation/sequential/icons.qrc
new file mode 100644
index 0000000..d55f797
--- /dev/null
+++ b/doc/src/snippets/animation/sequential/icons.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+ <qresource>
+    <file>icons/left.png</file>
+    <file>icons/right.png</file>
+ </qresource>
+</RCC>
diff --git a/doc/src/snippets/animation/sequential/icons/left.png b/doc/src/snippets/animation/sequential/icons/left.png
new file mode 100644
index 0000000..5dd8da0
--- /dev/null
+++ b/doc/src/snippets/animation/sequential/icons/left.png
diff --git a/doc/src/snippets/animation/sequential/icons/right.png b/doc/src/snippets/animation/sequential/icons/right.png
new file mode 100644
index 0000000..ac61326
--- /dev/null
+++ b/doc/src/snippets/animation/sequential/icons/right.png
diff --git a/doc/src/snippets/animation/sequential/main.cpp b/doc/src/snippets/animation/sequential/main.cpp
new file mode 100644
index 0000000..aff8f29
--- /dev/null
+++ b/doc/src/snippets/animation/sequential/main.cpp
@@ -0,0 +1,50 @@
+#include <QApplication>
+#include <QLabel>
+#include <QPropertyAnimation>
+#include <QSequentialAnimationGroup>
+#include "tracer.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QWidget window;
+    window.resize(720, 96);
+    window.show();
+
+    QLabel *label1 = new QLabel(&window);
+    label1->setPixmap(QPixmap(":/icons/left.png"));
+    label1->move(16, 16);
+    label1->show();
+
+    QLabel *label2 = new QLabel(&window);
+    label2->setPixmap(QPixmap(":/icons/right.png"));
+    label2->move(320, 16);
+    label2->show();
+
+    QPropertyAnimation *anim1 = new QPropertyAnimation(label1, "pos");
+    anim1->setDuration(2500);
+    anim1->setStartValue(QPoint(16, 16));
+    anim1->setEndValue(QPoint(320, 16));
+
+    QPropertyAnimation *anim2 = new QPropertyAnimation(label2, "pos");
+    anim2->setDuration(2500);
+    anim2->setStartValue(QPoint(320, 16));
+    anim2->setEndValue(QPoint(640, 16));
+
+    QSequentialAnimationGroup group;
+    group.addAnimation(anim1);
+    group.addAnimation(anim2);
+
+    Tracer tracer(&window);
+
+    QObject::connect(anim1, SIGNAL(valueChanged(QVariant)),
+                     &tracer, SLOT(recordValue(QVariant)));
+    QObject::connect(anim2, SIGNAL(valueChanged(QVariant)),
+                     &tracer, SLOT(recordValue(QVariant)));
+    QObject::connect(anim1, SIGNAL(finished()), &tracer, SLOT(checkValue()));
+    QObject::connect(anim2, SIGNAL(finished()), &tracer, SLOT(checkValue()));
+
+    group.start();
+    return app.exec();
+}
diff --git a/doc/src/snippets/animation/sequential/sequential.pro b/doc/src/snippets/animation/sequential/sequential.pro
new file mode 100644
index 0000000..fcf017f
--- /dev/null
+++ b/doc/src/snippets/animation/sequential/sequential.pro
@@ -0,0 +1,4 @@
+HEADERS   = tracer.h
+RESOURCES = icons.qrc
+SOURCES   = main.cpp \
+            tracer.cpp
diff --git a/doc/src/snippets/animation/sequential/tracer.cpp b/doc/src/snippets/animation/sequential/tracer.cpp
new file mode 100644
index 0000000..49bd51e
--- /dev/null
+++ b/doc/src/snippets/animation/sequential/tracer.cpp
@@ -0,0 +1,25 @@
+#include <QAbstractAnimation>
+#include <QDebug>
+#include <QPoint>
+#include "tracer.h"
+
+Tracer::Tracer(QObject *parent)
+    : QObject(parent)
+{
+}
+
+void Tracer::checkValue()
+{
+    QAbstractAnimation *animation = static_cast<QAbstractAnimation *>(sender());
+    if (time != animation->duration()) {
+        qDebug() << "Animation's last recorded time" << time;
+        qDebug() << "Expected" << animation->duration();
+    }
+}
+
+void Tracer::recordValue(const QVariant &value)
+{
+    QAbstractAnimation *animation = static_cast<QAbstractAnimation *>(sender());
+    this->value = value;
+    time = animation->currentTime();
+}
diff --git a/doc/src/snippets/animation/sequential/tracer.h b/doc/src/snippets/animation/sequential/tracer.h
new file mode 100644
index 0000000..1adb018
--- /dev/null
+++ b/doc/src/snippets/animation/sequential/tracer.h
@@ -0,0 +1,23 @@
+#ifndef TRACER_H
+#define TRACER_H
+
+#include <QObject>
+#include <QVariant>
+
+class Tracer : public QObject
+{
+    Q_OBJECT
+
+public:
+    Tracer(QObject *parent = 0);
+
+public slots:
+    void checkValue();
+    void recordValue(const QVariant &value);
+
+private:
+    QVariant value;
+    int time;
+};
+
+#endif
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
index a57de9d..d9e38ed 100644
--- a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
+++ b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
@@ -6,7 +6,7 @@ public:
     {
         qreal penWidth = 1;
         return QRectF(-10 - penWidth / 2, -10 - penWidth / 2,
-                      20 + penWidth / 2, 20 + penWidth / 2);
+                      20 + penWidth, 20 + penWidth);
     }
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
diff --git a/doc/src/snippets/picture/picture.cpp b/doc/src/snippets/picture/picture.cpp
index 07cedbf..be171c6 100644
--- a/doc/src/snippets/picture/picture.cpp
+++ b/doc/src/snippets/picture/picture.cpp
@@ -66,7 +66,7 @@ int main()
         QPicture picture;
         picture.load("drawing.pic");           // load picture
         QPainter painter;
-        painter.begin(&myWidget);              // paint in myWidget
+        painter.begin(&myImage);               // paint in myImage
         painter.drawPicture(0, 0, picture);    // draw the picture at (0,0)
         painter.end();                         // painting done
 //! [1]