aboutsummaryrefslogtreecommitdiffstats
path: root/doc/examples/transitions/main.qml
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@theqtcompany.com>2015-06-26 15:38:24 +0200
committerLeena Miettinen <riitta-leena.miettinen@theqtcompany.com>2015-06-26 13:41:57 +0000
commitf84169b51ebd02ddaff8d207e647e3d51853f2ba (patch)
tree6ad1b55322c51dbe58f7b2cb4618489c07fb3db3 /doc/examples/transitions/main.qml
parenteb848eb89fdb17a1719cc4096386ae3f001f3b28 (diff)
Doc: update the Qt Quick Application tutorial
To match the changes in the application templates and the Qt Quick Designer UI. Use the \example command to create an HTML of the example QML file. Change-Id: I4da7d5f3f14ae7a1e9597204cb9dbcd54c4127cd Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'doc/examples/transitions/main.qml')
-rw-r--r--doc/examples/transitions/main.qml37
1 files changed, 27 insertions, 10 deletions
diff --git a/doc/examples/transitions/main.qml b/doc/examples/transitions/main.qml
index 8769546257..c4ccfe0c5e 100644
--- a/doc/examples/transitions/main.qml
+++ b/doc/examples/transitions/main.qml
@@ -1,24 +1,41 @@
-import QtQuick 2.1
-import QtQuick.Window 2.1
+import QtQuick 2.5
+import QtQuick.Controls 1.4
-Window {
+ApplicationWindow {
id: page
visible: true
width: 360
height: 360
color: "#343434"
+ title: qsTr("Transitions")
+
+ menuBar: MenuBar {
+ Menu {
+ title: qsTr("File")
+ MenuItem {
+ text: qsTr("&Open")
+ onTriggered: console.log("Open action triggered");
+ }
+ MenuItem {
+ text: qsTr("Exit")
+ onTriggered: Qt.quit();
+ }
+ }
+ }
Image {
id: icon
x: 10
y: 20
- source: "states.png"
+ source: "states.svg"
}
Rectangle {
id: topLeftRect
- width: 64
- height: 64
+ x: 10
+ y: 20
+ width: 44
+ height: 44
color: "#00000000"
radius: 6
opacity: 1
@@ -37,8 +54,8 @@ Window {
Rectangle {
id: middleRightRect
- width: 64
- height: 64
+ width: 44
+ height: 44
color: "#00000000"
radius: 6
anchors.right: parent.right
@@ -55,8 +72,8 @@ Window {
Rectangle {
id: bottomLeftRect
- width: 64
- height: 64
+ width: 44
+ height: 44
color: "#00000000"
radius: 6
border.width: 1