aboutsummaryrefslogtreecommitdiffstats
path: root/doc/examples
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@digia.com>2013-03-06 15:48:13 +0100
committerLeena Miettinen <riitta-leena.miettinen@digia.com>2013-03-06 16:42:15 +0100
commita3b9c48f67f675f510195232216d42b3d6a47fbe (patch)
tree2c1d4db2da92ea38b51eac10465f61fd1a8bd93f /doc/examples
parentad14a4663334e2a6c087f4145388724dc0bb66f4 (diff)
Doc: update the tutorial app to Qt Quick 2
Change-Id: I9fafe7471567ed9cffae9e86a6c7e15069b683cb Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'doc/examples')
-rw-r--r--doc/examples/transitions/Transitions.pro19
-rw-r--r--doc/examples/transitions/main.cpp14
-rw-r--r--doc/examples/transitions/main.qml (renamed from doc/examples/transitions/qml/Transitions/main.qml)2
-rw-r--r--doc/examples/transitions/states.png (renamed from doc/examples/transitions/qml/Transitions/states.png)bin3400 -> 3400 bytes
4 files changed, 1 insertions, 34 deletions
diff --git a/doc/examples/transitions/Transitions.pro b/doc/examples/transitions/Transitions.pro
deleted file mode 100644
index 2fb4d91e25..0000000000
--- a/doc/examples/transitions/Transitions.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-# Add more folders to ship with the application, here
-folder_01.source = qml/Transitions
-folder_01.target = qml
-DEPLOYMENTFOLDERS = folder_01
-
-# Additional import path used to resolve QML modules in Creator's code model
-QML_IMPORT_PATH =
-
-# If your application uses the Qt Mobility libraries, uncomment the following
-# lines and add the respective components to the MOBILITY variable.
-# CONFIG += mobility
-# MOBILITY +=
-
-# The .cpp file which was generated for your project. Feel free to hack it.
-SOURCES += main.cpp
-
-# Please do not modify the following two lines. Required for deployment.
-include(qmlapplicationviewer/qmlapplicationviewer.pri)
-qtcAddDeployment()
diff --git a/doc/examples/transitions/main.cpp b/doc/examples/transitions/main.cpp
deleted file mode 100644
index cc176f1864..0000000000
--- a/doc/examples/transitions/main.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <QApplication>
-#include "qmlapplicationviewer.h"
-
-int main(int argc, char *argv[])
-{
- QApplication app(argc, argv);
-
- QmlApplicationViewer viewer;
- viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
- viewer.setMainQmlFile(QLatin1String("qml/Transitions/main.qml"));
- viewer.showExpanded();
-
- return app.exec();
-}
diff --git a/doc/examples/transitions/qml/Transitions/main.qml b/doc/examples/transitions/main.qml
index 6f1800ce85..b87a998e79 100644
--- a/doc/examples/transitions/qml/Transitions/main.qml
+++ b/doc/examples/transitions/main.qml
@@ -4,7 +4,7 @@
//! [0]
-import QtQuick 1.1
+import QtQuick 2.0
Rectangle {
id: page
diff --git a/doc/examples/transitions/qml/Transitions/states.png b/doc/examples/transitions/states.png
index 707d5c4e85..707d5c4e85 100644
--- a/doc/examples/transitions/qml/Transitions/states.png
+++ b/doc/examples/transitions/states.png
Binary files differ