Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I15cb7460171b38d11d66367aeb0831ec6e3ca933

21 files changed, 548 insertions, 25 deletions

diff --git a/examples/quick/demos/demos.pro b/examples/quick/demos/demos.pro
index 67128a905f..867dfa5a07 100644
--- a/examples/quick/demos/demos.pro
+++ b/examples/quick/demos/demos.pro
@@ -3,10 +3,10 @@ SUBDIRS = samegame \
             calqlatr \
             tweetsearch \
             maroon \
+            photosurface \
             stocqt
 
 EXAMPLE_FILES = \
     clocks \
     photoviewer \
-    photosurface \
     rssnews
diff --git a/examples/quick/demos/photosurface/main.cpp b/examples/quick/demos/photosurface/main.cpp
new file mode 100644
index 0000000000..90d6454211
--- /dev/null
+++ b/examples/quick/demos/photosurface/main.cpp
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifdef QT_WIDGETS_LIB
+#include <QtWidgets/QApplication>
+#else
+#include <QtGui/QGuiApplication>
+#endif
+#include <QtQml/QQmlApplicationEngine>
+#include <QtQuick/QQuickWindow>
+#include <QtCore/QUrl>
+
+int main(int argc, char* argv[])
+{
+    // The reason to use QApplication is that QWidget-based dialogs
+    // are the native dialogs on Qt-based platforms like KDE,
+    // but they cannot be instantiated if this is a QGuiApplication.
+#ifdef QT_WIDGETS_LIB
+    QApplication app(argc, argv);
+#else
+    QGuiApplication app(argc, argv);
+#endif
+    QQuickWindow::setDefaultAlphaBuffer(true);
+    QQmlApplicationEngine engine(QUrl("qrc:///photosurface.qml"));
+    return app.exec();
+}
diff --git a/examples/quick/demos/photosurface/photosurface.pro b/examples/quick/demos/photosurface/photosurface.pro
new file mode 100644
index 0000000000..5e5b0f0815
--- /dev/null
+++ b/examples/quick/demos/photosurface/photosurface.pro
@@ -0,0 +1,13 @@
+TEMPLATE = app
+
+QT += qml quick
+qtHaveModule(widgets): QT += widgets
+SOURCES += main.cpp
+RESOURCES += photosurface.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/photosurface
+INSTALLS += target
+ICON = resources/icon.png
+macx: ICON = resources/photosurface.icns
+win32: RC_FILE = resources/photosurface.rc
+
diff --git a/examples/quick/demos/photosurface/photosurface.qml b/examples/quick/demos/photosurface/photosurface.qml
index 4f7100358f..9d081de1e3 100644
--- a/examples/quick/demos/photosurface/photosurface.qml
+++ b/examples/quick/demos/photosurface/photosurface.qml
@@ -118,11 +118,27 @@ Window {
             }
         }
     }
+
+    Image {
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.margins: 10
+        source: "resources/folder.png"
+        MouseArea {
+            anchors.fill: parent
+            anchors.margins: -10
+            onClicked: fileDialog.open()
+        }
+    }
+
     Text {
         anchors.bottom: parent.bottom
         anchors.left: parent.left
+        anchors.right: parent.right
         anchors.margins: 10
         color: "darkgrey"
+        wrapMode: Text.WordWrap
+        font.pointSize: 8
         text: "On a touchscreen: use two fingers to zoom and rotate, one finger to drag\n" +
               "With a mouse: drag normally, use the vertical wheel to zoom, horizontal wheel to rotate, or hold Ctrl while using the vertical wheel to rotate"
     }
diff --git a/examples/quick/demos/photosurface/photosurface.qrc b/examples/quick/demos/photosurface/photosurface.qrc
new file mode 100644
index 0000000000..f8fafbb1ff
--- /dev/null
+++ b/examples/quick/demos/photosurface/photosurface.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/">
+        <file>photosurface.qml</file>
+        <file>resources/folder.png</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/demos/photosurface/resources/folder.png b/examples/quick/demos/photosurface/resources/folder.png
new file mode 100644
index 0000000000..2aec3b6ebf
--- /dev/null
+++ b/examples/quick/demos/photosurface/resources/folder.png
diff --git a/examples/quick/demos/photosurface/resources/icon.png b/examples/quick/demos/photosurface/resources/icon.png
new file mode 100644
index 0000000000..f8ff553fcb
--- /dev/null
+++ b/examples/quick/demos/photosurface/resources/icon.png
diff --git a/examples/quick/demos/photosurface/resources/photosurface.icns b/examples/quick/demos/photosurface/resources/photosurface.icns
new file mode 100644
index 0000000000..c69ec41c4e
--- /dev/null
+++ b/examples/quick/demos/photosurface/resources/photosurface.icns
diff --git a/examples/quick/demos/photosurface/resources/photosurface.ico b/examples/quick/demos/photosurface/resources/photosurface.ico
new file mode 100644
index 0000000000..03bb7ee367
--- /dev/null
+++ b/examples/quick/demos/photosurface/resources/photosurface.ico
diff --git a/examples/quick/demos/photosurface/resources/photosurface.rc b/examples/quick/demos/photosurface/resources/photosurface.rc
new file mode 100644
index 0000000000..ec18eb1cfc
--- /dev/null
+++ b/examples/quick/demos/photosurface/resources/photosurface.rc
@@ -0,0 +1,32 @@
+#include "winver.h"
+
+IDI_ICON1               ICON    DISCARDABLE     "photosurface.ico"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,0
+ PRODUCTVERSION 1,0,0,0
+ FILEFLAGS 0x0L
+ FILEFLAGSMASK 0x3fL
+ FILEOS 0x00040004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "CompanyName", "Digia Plc and/or its subsidiary(-ies)"
+            VALUE "FileDescription", "Photo Surface Demo"
+            VALUE "FileVersion", "1.0.0.0"
+            VALUE "LegalCopyright", "Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies)."
+            VALUE "InternalName", "photosurface"
+            VALUE "OriginalFilename", "photosurface.exe"
+            VALUE "ProductName", "Photo Surface Demo"
+            VALUE "ProductVersion", "1.0.0.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
diff --git a/examples/quick/dialogs/systemdialogs/FileDialogs.qml b/examples/quick/dialogs/systemdialogs/FileDialogs.qml
index d1278609f9..4a218853ef 100644
--- a/examples/quick/dialogs/systemdialogs/FileDialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/FileDialogs.qml
@@ -162,7 +162,7 @@ Rectangle {
                 text: "go to /tmp"
                 anchors.verticalCenter: parent.verticalCenter
                 // TODO: QTBUG-29814 This isn't portable, but we don't expose QDir::tempPath to QML yet.
-                onClicked: fileDialog.folder = "/tmp"
+                onClicked: fileDialog.folder = "/tmp" // file:///tmp would also be OK
             }
         }
     }
diff --git a/examples/quick/models/objectlistmodel/objectlistmodel.qmlproject b/examples/quick/models/objectlistmodel/objectlistmodel.qmlproject
deleted file mode 100644
index 2bb4016996..0000000000
--- a/examples/quick/models/objectlistmodel/objectlistmodel.qmlproject
+++ /dev/null
@@ -1,14 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-}
diff --git a/examples/quick/scenegraph/scenegraph.pro b/examples/quick/scenegraph/scenegraph.pro
index 3ddb216615..4354954445 100644
--- a/examples/quick/scenegraph/scenegraph.pro
+++ b/examples/quick/scenegraph/scenegraph.pro
@@ -5,3 +5,4 @@ SUBDIRS += \
         simplematerial \
         textureinsgnode \
         textureinthread \
+        threadedanimation
diff --git a/examples/quick/scenegraph/threadedanimation/main.cpp b/examples/quick/scenegraph/threadedanimation/main.cpp
new file mode 100644
index 0000000000..28abf9da94
--- /dev/null
+++ b/examples/quick/scenegraph/threadedanimation/main.cpp
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** 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, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, 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.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QGuiApplication>
+#include <QtQuick/QQuickView>
+
+#include "spinner.h"
+
+int main(int argc, char **argv)
+{
+    QGuiApplication app(argc, argv);
+
+    qmlRegisterType<Spinner>("Spinner", 1, 0, "Spinner");
+
+    QQuickView view;
+    view.setSource(QUrl("qrc:///scenegraph/threadedanimation/main.qml"));
+    view.show();
+
+    return app.exec();
+}
diff --git a/examples/quick/scenegraph/threadedanimation/main.qml b/examples/quick/scenegraph/threadedanimation/main.qml
new file mode 100644
index 0000000000..30ba9a2eb1
--- /dev/null
+++ b/examples/quick/scenegraph/threadedanimation/main.qml
@@ -0,0 +1,134 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** 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, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, 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.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [1]
+import QtQuick 2.0
+import Spinner 1.0
+
+Rectangle {
+
+    width: 320
+    height: 480
+
+    gradient: Gradient {
+        GradientStop { position: 0; color: "lightsteelblue" }
+        GradientStop { position: 1; color: "black" }
+    }
+
+    Rectangle {
+        color: Qt.rgba(1, 1, 1, 0.7);
+        radius: 10
+        border.width: 1
+        border.color: "white"
+        anchors.fill: blockingLabel;
+        anchors.margins: -10
+    }
+
+    Text {
+        id: blockingLabel
+        color: blocker.running ? "red" : "black"
+        text: blocker.running ? "Blocked!" : "Not blocked"
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: parent.top
+        anchors.topMargin: 100
+    }
+
+    Timer {
+        id: blocker
+        interval: 357
+        running: false;
+        repeat: true
+        onTriggered: {
+            var d = new Date();
+            var x = 0;
+            var wait = 50 + Math.random() * 200;
+            while ((new Date().getTime() - d.getTime()) < 100) {
+                x += 1;
+            }
+        }
+    }
+
+    Timer {
+        id: blockerEnabler
+        interval: 4000
+        running: true
+        repeat: true
+        onTriggered: {
+            blocker.running = !blocker.running
+        }
+    }
+
+    Spinner {
+        anchors.centerIn: parent
+        anchors.horizontalCenterOffset: 80
+        spinning: true
+    }
+
+    Image {
+        anchors.centerIn: parent
+        anchors.horizontalCenterOffset: -80
+        source: "spinner.png"
+        NumberAnimation on rotation {
+            from: 0; to: 360; duration: 1000; loops: Animation.Infinite
+        }
+    }
+
+    Rectangle {
+        color: Qt.rgba(1, 1, 1, 0.7)
+        radius: 10
+        border.width: 1
+        border.color: "white"
+        anchors.fill: label
+        anchors.margins: -10
+    }
+
+    Text {
+        id: label
+        color: "black"
+        wrapMode: Text.WordWrap
+        text: "This application shows two spinners. The one to the right is animated on the scene graph thread (when applicable) and the left one is using the normal Qt Quick animation system."
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+        anchors.margins: 20
+    }
+}
+//! [2]
diff --git a/examples/quick/scenegraph/threadedanimation/spinner.cpp b/examples/quick/scenegraph/threadedanimation/spinner.cpp
new file mode 100644
index 0000000000..7efcdb5da6
--- /dev/null
+++ b/examples/quick/scenegraph/threadedanimation/spinner.cpp
@@ -0,0 +1,133 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** 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, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, 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.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "spinner.h"
+
+#include <QtQuick/QQuickWindow>
+#include <QtGui/QScreen>
+#include <QtQuick/QSGSimpleTextureNode>
+
+#include <QtGui/QConicalGradient>
+#include <QtGui/QPainter>
+
+class SpinnerNode : public QObject, public QSGTransformNode
+{
+    Q_OBJECT
+public:
+    SpinnerNode(QQuickWindow *window)
+        : m_rotation(0)
+        , m_spinning(false)
+        , m_window(window)
+    {
+        connect(window, SIGNAL(beforeRendering()), this, SLOT(maybeRotate()));
+        connect(window, SIGNAL(frameSwapped()), this, SLOT(maybeUpdate()));
+
+        QImage image(":/scenegraph/threadedanimation/spinner.png");
+        m_texture = window->createTextureFromImage(image);
+        QSGSimpleTextureNode *textureNode = new QSGSimpleTextureNode();
+        textureNode->setTexture(m_texture);
+        textureNode->setRect(0, 0, image.width(), image.height());
+        textureNode->setFiltering(QSGTexture::Linear);
+        appendChildNode(textureNode);
+    }
+
+    ~SpinnerNode() {
+        delete m_texture;
+    }
+
+    void setSpinning(bool spinning)
+    {
+        m_spinning = spinning;
+    }
+
+public slots:
+    void maybeRotate() {
+        if (m_spinning) {
+            m_rotation += (360 / m_window->screen()->refreshRate());
+            QMatrix4x4 matrix;
+            matrix.translate(32, 32);
+            matrix.rotate(m_rotation, 0, 0, 1);
+            matrix.translate(-32, -32);
+            setMatrix(matrix);
+        }
+    }
+
+    void maybeUpdate() {
+        if (m_spinning) {
+            m_window->update();
+        }
+    }
+
+private:
+    qreal m_rotation;
+    bool m_spinning;
+    QSGTexture *m_texture;
+    QQuickWindow *m_window;
+};
+
+Spinner::Spinner()
+    : m_spinning(false)
+{
+    setSize(QSize(64, 64));
+    setFlag(ItemHasContents);
+}
+
+void Spinner::setSpinning(bool spinning)
+{
+    if (spinning == m_spinning)
+        return;
+    m_spinning = spinning;
+    emit spinningChanged();
+    update();
+}
+
+QSGNode *Spinner::updatePaintNode(QSGNode *old, UpdatePaintNodeData *)
+{
+    SpinnerNode *n = static_cast<SpinnerNode *>(old);
+    if (!n)
+        n = new SpinnerNode(window());
+
+    n->setSpinning(m_spinning);
+
+    return n;
+}
+
+#include "spinner.moc"
diff --git a/examples/quick/scenegraph/threadedanimation/spinner.h b/examples/quick/scenegraph/threadedanimation/spinner.h
new file mode 100644
index 0000000000..01b489021f
--- /dev/null
+++ b/examples/quick/scenegraph/threadedanimation/spinner.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** 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, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, 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.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SPINNER_H
+#define SPINNER_H
+
+#include <QtQuick/QQuickItem>
+
+class Spinner : public QQuickItem
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool spinning READ spinning WRITE setSpinning NOTIFY spinningChanged)
+
+public:
+    Spinner();
+
+    bool spinning() const { return m_spinning; }
+    void setSpinning(bool spinning);
+
+protected:
+    QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
+
+signals:
+    void spinningChanged();
+
+private:
+    bool m_spinning;
+};
+
+#endif // SQUIRCLE_H
diff --git a/examples/quick/scenegraph/threadedanimation/spinner.png b/examples/quick/scenegraph/threadedanimation/spinner.png
new file mode 100644
index 0000000000..bacb1698d7
--- /dev/null
+++ b/examples/quick/scenegraph/threadedanimation/spinner.png
diff --git a/examples/quick/scenegraph/threadedanimation/threadedanimation.pro b/examples/quick/scenegraph/threadedanimation/threadedanimation.pro
new file mode 100644
index 0000000000..419ee97e2e
--- /dev/null
+++ b/examples/quick/scenegraph/threadedanimation/threadedanimation.pro
@@ -0,0 +1,8 @@
+QT += qml quick
+
+HEADERS += spinner.h
+SOURCES += spinner.cpp main.cpp
+RESOURCES += threadedanimation.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/threadedanimation
+INSTALLS += target
diff --git a/examples/quick/scenegraph/threadedanimation/threadedanimation.qrc b/examples/quick/scenegraph/threadedanimation/threadedanimation.qrc
new file mode 100644
index 0000000000..ecaf4f7a31
--- /dev/null
+++ b/examples/quick/scenegraph/threadedanimation/threadedanimation.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/scenegraph/threadedanimation">
+        <file>main.qml</file>
+        <file>spinner.png</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/shared/Button.qml b/examples/quick/shared/Button.qml
index 9942a17b5c..551f7d6e04 100644
--- a/examples/quick/shared/Button.qml
+++ b/examples/quick/shared/Button.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.1
 
 Item {
     id: container
@@ -48,10 +48,10 @@ Item {
     signal clicked
     property alias containsMouse: mouseArea.containsMouse
     property alias pressed: mouseArea.pressed
-    implicitHeight: buttonLabel.implicitHeight
-    implicitWidth: buttonLabel.implicitWidth
-    height: buttonLabel.implicitHeight + 12
-    width: Math.max(80, implicitWidth + 8)
+    implicitHeight: buttonLabel.implicitHeight * 1.2
+    implicitWidth: buttonLabel.implicitWidth * 1.2
+    height: implicitHeight
+    width: implicitWidth
 
     SystemPalette { id: palette }
 
@@ -64,7 +64,7 @@ Item {
             GradientStop { position: 1.0; color: Qt.darker(palette.button, 1.3) }
         }
         antialiasing: true
-        radius: 5
+        radius: height / 4
         border.color: Qt.darker(palette.button, 1.5)
         border.width: 1
     }
@@ -78,10 +78,8 @@ Item {
 
     Text {
         id: buttonLabel
-        width: parent.width
-        horizontalAlignment: Text.Center
         text: container.text
         color: palette.buttonText
-        anchors.verticalCenter: parent.verticalCenter
+        anchors.centerIn: parent
     }
 }