diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 11:57:50 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 11:57:50 +0100 |
commit | 15dc45ce109fe41699950a9b87282901b21f2d3d (patch) | |
tree | 809e79e7b55988006bb3d990168b2bb7eda360b5 /examples/quick | |
parent | cf53bf9ae6716613c120cc4a0202c69bd59eba1e (diff) | |
parent | a496e0874858a4b7d991c179c0e12df46c3d324c (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia02971527a2d1a80c5624d69330428818aab3a41
Diffstat (limited to 'examples/quick')
7 files changed, 70 insertions, 6 deletions
diff --git a/examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc b/examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc index 60a9725e53..9e2dc01667 100644 --- a/examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc +++ b/examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc @@ -27,7 +27,7 @@ /*! \title QML Demo - Calqlatr - \example demos/calqlatr + \example quick/demos/calqlatr \brief This is an example calculator written in QML. \image qml-calqlatr-demo-small.png \ingroup qmldemos diff --git a/examples/quick/localstorage/doc/src/localstorage.qdoc b/examples/quick/localstorage/doc/src/localstorage.qdoc index d3b7fef798..f4dfa56dcf 100644 --- a/examples/quick/localstorage/doc/src/localstorage.qdoc +++ b/examples/quick/localstorage/doc/src/localstorage.qdoc @@ -26,13 +26,13 @@ ****************************************************************************/ /*! \title QtQuick Examples - Local Storage - \example localstorage - \brief This is a collection of QML local storage examples + \example quick/localstorage + \brief A collection of QML local storage examples. \image qml-localstorage-example.png This is a collection of small QML examples relating to local storage functionality. - Hello World demos creating a simple SQL table and how to do inserting/selecting operations. + \e {Hello World} demonstrates creating a simple SQL table and doing insert/select operations. */ diff --git a/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc b/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc index e733512712..6f1d751a5f 100644 --- a/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc +++ b/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc @@ -28,8 +28,8 @@ /*! \title Scenegraph Painted Item Example - \brief Shows how to implement QPainter-based custom scenegraph items - \example quick/painteditem/textballoons + \brief Shows how to implement QPainter-based custom scenegraph items. + \example quick/customitems/painteditem \ingroup qtquickexamples The Painted Item example shows how to use the QML Scene Graph framework to diff --git a/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qmlproject b/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qmlproject new file mode 100644 index 0000000000..aa20fbadc0 --- /dev/null +++ b/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qmlproject @@ -0,0 +1,16 @@ +import QmlProject 1.1 + +Project { + mainFile: "dynamicview.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } +} diff --git a/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qmlproject b/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qmlproject new file mode 100644 index 0000000000..aa20fbadc0 --- /dev/null +++ b/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qmlproject @@ -0,0 +1,16 @@ +import QmlProject 1.1 + +Project { + mainFile: "dynamicview.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } +} diff --git a/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qmlproject b/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qmlproject new file mode 100644 index 0000000000..aa20fbadc0 --- /dev/null +++ b/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qmlproject @@ -0,0 +1,16 @@ +import QmlProject 1.1 + +Project { + mainFile: "dynamicview.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } +} diff --git a/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qmlproject b/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qmlproject new file mode 100644 index 0000000000..aa20fbadc0 --- /dev/null +++ b/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qmlproject @@ -0,0 +1,16 @@ +import QmlProject 1.1 + +Project { + mainFile: "dynamicview.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } +} |