Doc: update the Transitions example

...to use the new Qt logo

Change-Id: I111d070c2ae40b71e650d78bd15d360328b474e3
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>

4 files changed, 85 insertions, 231 deletions

diff --git a/doc/examples/transitions/MainForm.ui.qml b/doc/examples/transitions/MainForm.ui.qml
index f599b842a3..61a0e92b29 100644
--- a/doc/examples/transitions/MainForm.ui.qml
+++ b/doc/examples/transitions/MainForm.ui.qml
@@ -1,79 +1,38 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** 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 The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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 The Qt Company Ltd 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$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Layouts 1.2
+import QtQuick 2.6
+import QtQuick.Controls 1.5
+import QtQuick.Layouts 1.3
 
 Item {
+    id: page
     width: 640
     height: 480
+    property alias mouseArea1: mouseArea1
+    property alias mouseArea3: mouseArea3
+    property alias mouseArea2: mouseArea2
     property alias bottomLeftRect: bottomLeftRect
     property alias middleRightRect: middleRightRect
     property alias topLeftRect: topLeftRect
     property alias icon: icon
-    property alias mouseArea1: mouseArea1
-    property alias mouseArea2: mouseArea2
-    property alias mouseArea3: mouseArea3
+
+    Image {
+        id: icon
+        x: 10
+        y: 20
+        source: "qt-logo.png"
+    }
 
     Rectangle {
         id: topLeftRect
-        width: 46
-        height: 55
+        width: 55
+        height: 41
         color: "#00000000"
-        radius: 6
+        radius: 0
+        border.color: "#808080"
         anchors.left: parent.left
         anchors.leftMargin: 10
         anchors.top: parent.top
         anchors.topMargin: 20
-        border.color: "#808080"
+        border.width: 1
 
         MouseArea {
             id: mouseArea1
@@ -83,12 +42,12 @@ Item {
 
     Rectangle {
         id: middleRightRect
-        x: 6
+        x: -8
         y: 6
-        width: 46
-        height: 55
+        width: 55
+        height: 41
         color: "#00000000"
-        radius: 6
+        radius: 0
         anchors.verticalCenter: parent.verticalCenter
         anchors.right: parent.right
         anchors.rightMargin: 10
@@ -96,32 +55,27 @@ Item {
             id: mouseArea2
             anchors.fill: parent
         }
+        border.width: 1
         border.color: "#808080"
     }
 
     Rectangle {
         id: bottomLeftRect
-        x: 0
-        y: 4
-        width: 46
-        height: 55
+        y: -2
+        width: 55
+        height: 41
         color: "#00000000"
-        radius: 6
+        radius: 0
         anchors.bottom: parent.bottom
         anchors.bottomMargin: 20
+        anchors.left: parent.left
+        anchors.leftMargin: 10
         MouseArea {
             id: mouseArea3
             anchors.fill: parent
         }
-        anchors.left: parent.left
+        border.width: 1
         border.color: "#808080"
-        anchors.leftMargin: 10
     }
 
-    Image {
-        id: icon
-        x: 10
-        y: 20
-        source: "qt-logo.png"
-    }
 }
diff --git a/doc/examples/transitions/main.cpp b/doc/examples/transitions/main.cpp
index 618e0f3da8..d76049d67e 100644
--- a/doc/examples/transitions/main.cpp
+++ b/doc/examples/transitions/main.cpp
@@ -1,53 +1,3 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** 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 The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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 The Qt Company Ltd 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$
-**
-****************************************************************************/
-
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
diff --git a/doc/examples/transitions/main.qml b/doc/examples/transitions/main.qml
index 113cb551b0..b2d6928de4 100644
--- a/doc/examples/transitions/main.qml
+++ b/doc/examples/transitions/main.qml
@@ -1,122 +1,72 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** 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 The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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 The Qt Company Ltd 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$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-import QtQuick.Controls 1.4
+import QtQuick 2.6
+import QtQuick.Controls 1.5
 import QtQuick.Dialogs 1.2
 
 ApplicationWindow {
     visible: true
-    title: qsTr("Transitions")
     width: 330
     height: 330
+    title: qsTr("Transitions")
 
     MainForm {
         anchors.fill: parent
         id: page
         mouseArea1 {
-            onClicked: stateGroup.state = ' '
-        }
-        mouseArea2 {
-            onClicked: stateGroup.state = 'State1'
-        }
-        mouseArea3 {
-            onClicked: stateGroup.state = 'State2'
-        }
+                   onClicked: stateGroup.state = ' '
+               }
+           mouseArea2 {
+               onClicked: stateGroup.state = 'State1'
+           }
+           mouseArea3 {
+               onClicked: stateGroup.state = 'State2'
+           }
     }
 
     StateGroup {
-        id: stateGroup
-        states: [
-            State {
-                name: "State1"
+            id: stateGroup
+            states: [
+                State {
+                    name: "State1"
 
-                PropertyChanges {
-                    target: page.icon
-                    x: page.middleRightRect.x
-                    y: page.middleRightRect.y
-                }
-            },
-            State {
-                name: "State2"
+                    PropertyChanges {
+                        target: page.icon
+                        x: page.middleRightRect.x
+                        y: page.middleRightRect.y
+                    }
+                },
+                State {
+                    name: "State2"
 
-                PropertyChanges {
-                    target: page.icon
-                    x: page.bottomLeftRect.x
-                    y: page.bottomLeftRect.y
+                    PropertyChanges {
+                        target: page.icon
+                        x: page.bottomLeftRect.x
+                        y: page.bottomLeftRect.y
+                    }
                 }
-            }
-        ]
-        transitions: [
-                Transition {
-                        from: "*"; to: "State1"
-                        NumberAnimation {
-                            easing.type: Easing.OutBounce
-                            properties: "x,y";
-                            duration: 1000
-                        }
-                    },
-                Transition {
-                        from: "*"; to: "State2"
-                        NumberAnimation {
-                            properties: "x,y";
-                            easing.type: Easing.InOutQuad;
-                            duration: 2000
-                        }
-                    },
-                Transition {
-                         NumberAnimation {
-                             properties: "x,y";
-                             duration: 200
+            ]
+            transitions: [
+                    Transition {
+                            from: "*"; to: "State1"
+                            NumberAnimation {
+                                easing.type: Easing.OutBounce
+                                properties: "x,y";
+                                duration: 1000
+                            }
+                        },
+                    Transition {
+                            from: "*"; to: "State2"
+                            NumberAnimation {
+                                properties: "x,y";
+                                easing.type: Easing.InOutQuad;
+                                duration: 2000
+                            }
+                        },
+                    Transition {
+                             NumberAnimation {
+                                 properties: "x,y";
+                                 duration: 200
+                             }
                          }
-                     }
-                ]
-        }
-    }
+                    ]
+            }
+}
diff --git a/doc/examples/transitions/qt-logo.png b/doc/examples/transitions/qt-logo.png
index 14ddf2a028..f465822ed0 100644
--- a/doc/examples/transitions/qt-logo.png
+++ b/doc/examples/transitions/qt-logo.png