aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-02-03 14:43:05 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-06 22:23:34 +0100
commit3f622e0dc71d67cc922e530511d2f34ad678fb00 (patch)
tree6438b00467f134918deabc77642b7ad1254e4c52
parenteda4b3dc3c9421a0b3009c11b858f4e5fe1d8ba2 (diff)
Homogenize examples
Several groups of examples are now organized like the other Qt examples, with a project file, doc entry, and single launch point. Change-Id: I2fd957c00e0d1121ebe47c806e54e6999425d1d3 Reviewed-by: Martin Jones <martin.jones@nokia.com>
-rw-r--r--doc/src/examples/examples-groups.qdoc100
-rw-r--r--doc/src/images/qml-animations-example.pngbin0 -> 2544 bytes
-rw-r--r--doc/src/images/qml-i18n-example.pngbin0 -> 1945 bytes
-rw-r--r--doc/src/images/qml-imageelements-example.pngbin0 -> 45828 bytes
-rw-r--r--doc/src/images/qml-modelviews-example.pngbin0 -> 51072 bytes
-rw-r--r--doc/src/images/qml-positioners-example.pngbin0 -> 9828 bytes
-rw-r--r--doc/src/images/qml-shadereffects-example.pngbin0 -> 133753 bytes
-rw-r--r--doc/src/images/qml-text-example.pngbin0 -> 71427 bytes
-rw-r--r--doc/src/images/qml-touchinteraction-example.pngbin0 -> 35860 bytes
-rw-r--r--examples/declarative/animation/animation.qml (renamed from examples/declarative/animation/animations.qml)0
-rw-r--r--examples/declarative/animation/animation.qmlproject16
-rw-r--r--examples/declarative/imageelements/content/ImageCell.qml (renamed from examples/declarative/imageelements/ImageCell.qml)3
-rw-r--r--examples/declarative/imageelements/image.qml1
-rw-r--r--examples/declarative/imageelements/imageelements.qml58
-rw-r--r--examples/declarative/imageelements/imageelements.qmlproject16
-rw-r--r--examples/declarative/modelviews/gridview/gridview-example.qml4
-rw-r--r--examples/declarative/modelviews/modelviews.qml64
-rw-r--r--examples/declarative/modelviews/modelviews.qmlproject16
-rw-r--r--examples/declarative/shadereffects/content/Slider.qml (renamed from examples/declarative/shadereffects/Slider.qml)0
-rw-r--r--examples/declarative/shadereffects/content/face-smile.png (renamed from examples/declarative/shadereffects/face-smile.png)bin15408 -> 15408 bytes
-rw-r--r--examples/declarative/shadereffects/content/qt-logo.png (renamed from examples/declarative/shadereffects/qt-logo.png)bin13923 -> 13923 bytes
-rw-r--r--examples/declarative/shadereffects/shadereffects.qml (renamed from examples/declarative/shadereffects/shader-demo.qml)5
-rw-r--r--examples/declarative/shared/LauncherList.qml7
-rw-r--r--examples/declarative/text/text.qml57
-rw-r--r--examples/declarative/text/text.qmlproject16
-rw-r--r--examples/declarative/touchinteraction/touchinteraction.qml57
-rw-r--r--examples/declarative/touchinteraction/touchinteraction.qmlproject16
27 files changed, 431 insertions, 5 deletions
diff --git a/doc/src/examples/examples-groups.qdoc b/doc/src/examples/examples-groups.qdoc
new file mode 100644
index 0000000000..9a6dafa435
--- /dev/null
+++ b/doc/src/examples/examples-groups.qdoc
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+ \title QML Examples - Internationalization
+ \example declarative/i18n
+ \image qml-i18n-example.png
+ \brief This is an internationalization example
+*/
+/*!
+ \title QML Examples - Shader Effects
+ \example declarative/shadereffects
+ \image qml-shadereffects-example.png
+ \brief This is a shader effects example
+
+ This example demonstrates a couple of visual effects that you can perform
+ with shaders in QtQuick 2.0
+*/
+/*!
+ \title QML Examples - Positioners
+ \example declarative/positioners
+ \brief This is a positioners example
+ \image qml-positioners-example.png
+
+ This example demonstrates the positioners and some of their animations.
+*/
+/*!
+ \title QML Examples - Animation
+ \example declarative/animation
+ \brief This is a collection of QML examples
+ \image qml-animations-example.png
+
+ This is a collection of small QML examples relating to animation. Each example is
+ a small QML file, usually containing or emphasizing a particular element or
+ feature. You can run and observe the behavior of each example.
+*/
+/*!
+ \title QML Examples - Image Elements
+ \example declarative/imageelements
+ \brief This is a collection of QML examples
+ \image qml-imageelements-example.png
+
+ This is a collection of small QML examples relating to image elements. Each example is
+ a small QML file, usually containing or emphasizing a particular element or
+ feature. You can run and observe the behavior of each example.
+*/
+/*!
+ \title QML Examples - Models and Views
+ \example declarative/modelviews
+ \brief This is a collection of QML examples
+ \image qml-modelviews-example.png
+
+ This is a collection of small QML examples relating to models and views. Each example is
+ a small QML file, usually containing or emphasizing a particular element or
+ feature. You can run and observe the behavior of each example.
+*/
+/*!
+ \title QML Examples - Text
+ \example declarative/text
+ \brief This is a collection of QML examples
+ \image qml-text-example.png
+
+ This is a collection of small QML examples relating to text. Each example is
+ a small QML file, usually containing or emphasizing a particular element or
+ feature. You can run and observe the behavior of each example.
+*/
+/*!
+ \title QML Examples - Touch Interaction
+ \example declarative/touchinteraction
+ \brief This is a collection of QML examples
+ \image qml-touchinteraction-example.png
+
+ This is a collection of small QML examples relating to touch and multi-point touch. Each example is
+ a small QML file, usually containing or emphasizing a particular element or
+ feature. You can run and observe the behavior of each example.
+*/
diff --git a/doc/src/images/qml-animations-example.png b/doc/src/images/qml-animations-example.png
new file mode 100644
index 0000000000..dbaf2e4d3b
--- /dev/null
+++ b/doc/src/images/qml-animations-example.png
Binary files differ
diff --git a/doc/src/images/qml-i18n-example.png b/doc/src/images/qml-i18n-example.png
new file mode 100644
index 0000000000..02f645e702
--- /dev/null
+++ b/doc/src/images/qml-i18n-example.png
Binary files differ
diff --git a/doc/src/images/qml-imageelements-example.png b/doc/src/images/qml-imageelements-example.png
new file mode 100644
index 0000000000..57b23a1f05
--- /dev/null
+++ b/doc/src/images/qml-imageelements-example.png
Binary files differ
diff --git a/doc/src/images/qml-modelviews-example.png b/doc/src/images/qml-modelviews-example.png
new file mode 100644
index 0000000000..b40334653d
--- /dev/null
+++ b/doc/src/images/qml-modelviews-example.png
Binary files differ
diff --git a/doc/src/images/qml-positioners-example.png b/doc/src/images/qml-positioners-example.png
new file mode 100644
index 0000000000..90d70ff307
--- /dev/null
+++ b/doc/src/images/qml-positioners-example.png
Binary files differ
diff --git a/doc/src/images/qml-shadereffects-example.png b/doc/src/images/qml-shadereffects-example.png
new file mode 100644
index 0000000000..aba4e1faa9
--- /dev/null
+++ b/doc/src/images/qml-shadereffects-example.png
Binary files differ
diff --git a/doc/src/images/qml-text-example.png b/doc/src/images/qml-text-example.png
new file mode 100644
index 0000000000..71425d1522
--- /dev/null
+++ b/doc/src/images/qml-text-example.png
Binary files differ
diff --git a/doc/src/images/qml-touchinteraction-example.png b/doc/src/images/qml-touchinteraction-example.png
new file mode 100644
index 0000000000..d4f0cab201
--- /dev/null
+++ b/doc/src/images/qml-touchinteraction-example.png
Binary files differ
diff --git a/examples/declarative/animation/animations.qml b/examples/declarative/animation/animation.qml
index 7c5829e790..7c5829e790 100644
--- a/examples/declarative/animation/animations.qml
+++ b/examples/declarative/animation/animation.qml
diff --git a/examples/declarative/animation/animation.qmlproject b/examples/declarative/animation/animation.qmlproject
new file mode 100644
index 0000000000..2e96daa881
--- /dev/null
+++ b/examples/declarative/animation/animation.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.1
+
+Project {
+ mainFile: "animation.qml"
+
+ /* Include .qml, .js, and image files from current directory and subdirectories */
+ QmlFiles {
+ directory: "."
+ }
+ JavaScriptFiles {
+ directory: "."
+ }
+ ImageFiles {
+ directory: "."
+ }
+}
diff --git a/examples/declarative/imageelements/ImageCell.qml b/examples/declarative/imageelements/content/ImageCell.qml
index 86a8417fe0..fcc6b47af5 100644
--- a/examples/declarative/imageelements/ImageCell.qml
+++ b/examples/declarative/imageelements/content/ImageCell.qml
@@ -38,7 +38,6 @@
**
****************************************************************************/
import QtQuick 2.0
-import "content"
Item {
property alias mode: image.fillMode
@@ -49,7 +48,7 @@ Item {
Image {
id: image
width: parent.width; height: parent.height - captionItem.height
- source: "content/qt-logo.png"
+ source: "qt-logo.png"
clip: true // only makes a difference if mode is PreserveAspectCrop
smooth: true
}
diff --git a/examples/declarative/imageelements/image.qml b/examples/declarative/imageelements/image.qml
index 0107cbf43a..4ca26c1630 100644
--- a/examples/declarative/imageelements/image.qml
+++ b/examples/declarative/imageelements/image.qml
@@ -39,6 +39,7 @@
****************************************************************************/
import QtQuick 2.0
+import "content"
Rectangle {
width: 490
diff --git a/examples/declarative/imageelements/imageelements.qml b/examples/declarative/imageelements/imageelements.qml
new file mode 100644
index 0000000000..2ef5154968
--- /dev/null
+++ b/examples/declarative/imageelements/imageelements.qml
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** 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 Nokia Corporation 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$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import "../shared"
+
+Item {
+ height: 480
+ width: 640
+ LauncherList {
+ id: ll
+ anchors.fill: parent
+ Component.onCompleted: {
+ addExample("BorderImage", "An image with scaled borders", Qt.resolvedUrl("borderimage.qml"));
+ addExample("Image", "A showcase of the options available to Image", Qt.resolvedUrl("image.qml"));
+ addExample("Shadows", "Rectangles with a drop-shadow effect", Qt.resolvedUrl("shadows.qml"));
+ addExample("Simple Sprite", "A simple sprite-based animation", Qt.resolvedUrl("simplesprite.qml"));
+ addExample("Sprite Image", "A sprite-based animation with complex transitions", Qt.resolvedUrl("spriteimage.qml"));
+ }
+ }
+}
diff --git a/examples/declarative/imageelements/imageelements.qmlproject b/examples/declarative/imageelements/imageelements.qmlproject
new file mode 100644
index 0000000000..4292a0c112
--- /dev/null
+++ b/examples/declarative/imageelements/imageelements.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.1
+
+Project {
+ mainFile: "imageelements.qml"
+
+ /* Include .qml, .js, and image files from current directory and subdirectories */
+ QmlFiles {
+ directory: "."
+ }
+ JavaScriptFiles {
+ directory: "."
+ }
+ ImageFiles {
+ directory: "."
+ }
+}
diff --git a/examples/declarative/modelviews/gridview/gridview-example.qml b/examples/declarative/modelviews/gridview/gridview-example.qml
index 9626b5f29e..ea3bb5cec9 100644
--- a/examples/declarative/modelviews/gridview/gridview-example.qml
+++ b/examples/declarative/modelviews/gridview/gridview-example.qml
@@ -70,6 +70,10 @@ Rectangle {
anchors { top: myIcon.bottom; horizontalCenter: parent.horizontalCenter }
text: name
}
+ MouseArea {
+ anchors.fill: parent
+ onClicked: parent.GridView.view.currentIndex = index
+ }
}
}
diff --git a/examples/declarative/modelviews/modelviews.qml b/examples/declarative/modelviews/modelviews.qml
new file mode 100644
index 0000000000..86b10ca4ba
--- /dev/null
+++ b/examples/declarative/modelviews/modelviews.qml
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** 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 Nokia Corporation 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$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import "../shared"
+
+Item {
+ height: 480
+ width: 480
+ LauncherList {
+ id: ll
+ anchors.fill: parent
+ Component.onCompleted: {
+ addExample("Dynamic List", "A ListView harboring dynamic data", Qt.resolvedUrl("listview/dynamiclist.qml"));
+ addExample("Expanding Delegates", "Delegates that expand to fill the list when clicked", Qt.resolvedUrl("listview/expandingdelegates.qml"));
+ addExample("Highlight", "Adding a highlight to the current item", Qt.resolvedUrl("listview/highlight.qml"));
+ addExample("Sections", "A ListView with section headers", Qt.resolvedUrl("listview/sections.qml"));
+ addExample("GridView", "A view laid out in a grid", Qt.resolvedUrl("gridview/gridview-example.qml"));
+ addExample("PathView", "A view laid out along a path", Qt.resolvedUrl("pathview/pathview-example.qml"));
+ addExample("Package", "Using a package to transition items between views", Qt.resolvedUrl("package/view.qml"));
+ addExample("Parallax", "Adds a background and a parallax effect to a ListView", Qt.resolvedUrl("parallax/parallax.qml"));
+ addExample("Slideshow", "A model demonstrating delayed image loading", Qt.resolvedUrl("visualdatamodel/slideshow.qml"));
+ addExample("Sorted Model", "Two views on a model, one of which is sorted", Qt.resolvedUrl("visualdatamodel/sortedmodel.qml"));
+ addExample("VisualItemModel", "A model that consists of the actual Items", Qt.resolvedUrl("visualitemmodel/visualitemmodel.qml"));
+ }
+ }
+}
diff --git a/examples/declarative/modelviews/modelviews.qmlproject b/examples/declarative/modelviews/modelviews.qmlproject
new file mode 100644
index 0000000000..40f9e568fd
--- /dev/null
+++ b/examples/declarative/modelviews/modelviews.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.1
+
+Project {
+ mainFile: "modelviews.qml"
+
+ /* Include .qml, .js, and image files from current directory and subdirectories */
+ QmlFiles {
+ directory: "."
+ }
+ JavaScriptFiles {
+ directory: "."
+ }
+ ImageFiles {
+ directory: "."
+ }
+}
diff --git a/examples/declarative/shadereffects/Slider.qml b/examples/declarative/shadereffects/content/Slider.qml
index 4ddc6d3432..4ddc6d3432 100644
--- a/examples/declarative/shadereffects/Slider.qml
+++ b/examples/declarative/shadereffects/content/Slider.qml
diff --git a/examples/declarative/shadereffects/face-smile.png b/examples/declarative/shadereffects/content/face-smile.png
index 3d66d72578..3d66d72578 100644
--- a/examples/declarative/shadereffects/face-smile.png
+++ b/examples/declarative/shadereffects/content/face-smile.png
Binary files differ
diff --git a/examples/declarative/shadereffects/qt-logo.png b/examples/declarative/shadereffects/content/qt-logo.png
index 7d3e97eb36..7d3e97eb36 100644
--- a/examples/declarative/shadereffects/qt-logo.png
+++ b/examples/declarative/shadereffects/content/qt-logo.png
Binary files differ
diff --git a/examples/declarative/shadereffects/shader-demo.qml b/examples/declarative/shadereffects/shadereffects.qml
index 8f685266d6..842e42b89f 100644
--- a/examples/declarative/shadereffects/shader-demo.qml
+++ b/examples/declarative/shadereffects/shadereffects.qml
@@ -40,6 +40,7 @@
****************************************************************************/
import QtQuick 2.0
+import "content"
Image {
width: 640
@@ -90,13 +91,13 @@ Image {
Image {
width: 160
height: 140
- source: "qt-logo.png"
+ source: "content/qt-logo.png"
smooth: true
}
Image {
width: 160
height: 140
- source: "face-smile.png"
+ source: "content/face-smile.png"
smooth: true
}
}
diff --git a/examples/declarative/shared/LauncherList.qml b/examples/declarative/shared/LauncherList.qml
index 03463e1be2..782fcc7ddd 100644
--- a/examples/declarative/shared/LauncherList.qml
+++ b/examples/declarative/shared/LauncherList.qml
@@ -65,7 +65,7 @@ ListView {
Rectangle {
id: bg
anchors.fill: parent
- color: "black"
+ color: "white"
}
MouseArea{
anchors.fill: parent
@@ -83,6 +83,11 @@ ListView {
anchors.bottom: parent.bottom
width: parent.width
height: 40
+ MouseArea{
+ anchors.fill: parent
+ enabled: ei.visible
+ //Eats mouse events
+ }
Image {
source: "back.png"
anchors.verticalCenter: parent.verticalCenter
diff --git a/examples/declarative/text/text.qml b/examples/declarative/text/text.qml
new file mode 100644
index 0000000000..14a88d2e91
--- /dev/null
+++ b/examples/declarative/text/text.qml
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** 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 Nokia Corporation 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$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import "../shared"
+
+Item {
+ height: 480
+ width: 480
+ LauncherList {
+ id: ll
+ anchors.fill: parent
+ Component.onCompleted: {
+ addExample("Hello", "An Animated Hello World", Qt.resolvedUrl("fonts/hello.qml"));
+ addExample("Fonts", "Using various fonts with a Text element", Qt.resolvedUrl("fonts/fonts.qml"));
+ addExample("Available Fonts", "A list of your available fonts", Qt.resolvedUrl("fonts/availableFonts.qml"));
+ addExample("Banner", "Large, scrolling text", Qt.resolvedUrl("fonts/banner.qml"));
+ }
+ }
+}
diff --git a/examples/declarative/text/text.qmlproject b/examples/declarative/text/text.qmlproject
new file mode 100644
index 0000000000..c08d9b9a89
--- /dev/null
+++ b/examples/declarative/text/text.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.1
+
+Project {
+ mainFile: "text.qml"
+
+ /* Include .qml, .js, and image files from current directory and subdirectories */
+ QmlFiles {
+ directory: "."
+ }
+ JavaScriptFiles {
+ directory: "."
+ }
+ ImageFiles {
+ directory: "."
+ }
+}
diff --git a/examples/declarative/touchinteraction/touchinteraction.qml b/examples/declarative/touchinteraction/touchinteraction.qml
new file mode 100644
index 0000000000..ac0c8bfc55
--- /dev/null
+++ b/examples/declarative/touchinteraction/touchinteraction.qml
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** 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 Nokia Corporation 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$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import "../shared"
+
+Item {
+ height: 480
+ width: 320
+ LauncherList {
+ id: ll
+ anchors.fill: parent
+ Component.onCompleted: {
+ addExample("MouseArea", "Using the basic touch input element", Qt.resolvedUrl("mousearea/mousearea-example.qml"));
+ addExample("Multipoint Flames", "Create multiple flames with multiple fingers", Qt.resolvedUrl("multipointtouch/multiflame.qml"));
+ addExample("Bear-Whack", "Use multiple touches to knock all the bears down", Qt.resolvedUrl("multipointtouch/bearwhack.qml"));
+ addExample("Flick Resize", "Manipulate images using pinch gestures", Qt.resolvedUrl("pincharea/flickresize.qml"));
+ }
+ }
+}
diff --git a/examples/declarative/touchinteraction/touchinteraction.qmlproject b/examples/declarative/touchinteraction/touchinteraction.qmlproject
new file mode 100644
index 0000000000..a9aa9d2e81
--- /dev/null
+++ b/examples/declarative/touchinteraction/touchinteraction.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.1
+
+Project {
+ mainFile: "touchinteraction.qml"
+
+ /* Include .qml, .js, and image files from current directory and subdirectories */
+ QmlFiles {
+ directory: "."
+ }
+ JavaScriptFiles {
+ directory: "."
+ }
+ ImageFiles {
+ directory: "."
+ }
+}