From 9565fb9f360b053f47aa46c5112c86925c7e225f Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 19 Feb 2013 11:16:56 +0100 Subject: [PATCH] Doc: Fix paths and add missing project files for QML and Quick examples This change fixes a number of 'example path does not exist' warnings from qdoc, and adds .qmlproject files for pure qml examples so they'll appear correctly in the example manifest files. Change-Id: Id0a424c4826fb5d8ebe6c3309bf33b976ff8477c Reviewed-by: Geir Vattekar Reviewed-by: Jerome Pasion --- examples/qml/dynamicscene/dynamicscene.qmlproject | 16 ++++++++++++++++ examples/qml/i18n/i18n.qmlproject | 16 ++++++++++++++++ .../quick/demos/calqlatr/doc/src/calqlatr.qdoc | 2 +- .../quick/localstorage/doc/src/localstorage.qdoc | 6 +++--- .../textballoons/doc/src/textballoons.qdoc | 4 ++-- .../dynamicview1/dynamicview1.qmlproject | 16 ++++++++++++++++ .../dynamicview2/dynamicview2.qmlproject | 16 ++++++++++++++++ .../dynamicview3/dynamicview3.qmlproject | 16 ++++++++++++++++ .../dynamicview4/dynamicview4.qmlproject | 16 ++++++++++++++++ 9 files changed, 102 insertions(+), 6 deletions(-) create mode 100644 examples/qml/dynamicscene/dynamicscene.qmlproject create mode 100644 examples/qml/i18n/i18n.qmlproject create mode 100644 examples/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qmlproject create mode 100644 examples/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qmlproject create mode 100644 examples/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qmlproject create mode 100644 examples/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qmlproject diff --git a/examples/qml/dynamicscene/dynamicscene.qmlproject b/examples/qml/dynamicscene/dynamicscene.qmlproject new file mode 100644 index 0000000..52ac474 --- /dev/null +++ b/examples/qml/dynamicscene/dynamicscene.qmlproject @@ -0,0 +1,16 @@ +import QmlProject 1.1 + +Project { + mainFile: "dynamicscene.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } +} diff --git a/examples/qml/i18n/i18n.qmlproject b/examples/qml/i18n/i18n.qmlproject new file mode 100644 index 0000000..7ee5b76 --- /dev/null +++ b/examples/qml/i18n/i18n.qmlproject @@ -0,0 +1,16 @@ +import QmlProject 1.1 + +Project { + mainFile: "i18n.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } +} diff --git a/examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc b/examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc index 60a9725..9e2dc01 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 d3b7fef..f4dfa56 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 e733512..6f1d751 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 0000000..aa20fba --- /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 0000000..aa20fba --- /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 0000000..aa20fba --- /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 0000000..aa20fba --- /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: "." + } +} -- 1.7.2.5