From 2dcad8f5c899ecec459d9e2a2c30211ee9e6c20c Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Tue, 8 Apr 2014 13:24:42 +0200 Subject: Doc: correct link/compilation errors in Qt Declarative Task-number: QTBUG-34749 Change-Id: I507d54b0568d77c6099a0bd99f5c369b8667032a Reviewed-by: Venugopal Shivashankar Reviewed-by: Martin Smith --- .../doc/src/networkaccessmanagerfactory.qdoc | 38 +++++++++++++++ .../customitems/dialcontrol/dialcontrol.qmlproject | 17 +++++++ .../doc/images/qml-dialcontrol-example.png | Bin 0 -> 33569 bytes .../dialcontrol/doc/src/dialcontrol.qdoc | 53 +++++++++++++++++++++ .../flipable/doc/images/qml-flipable-example.png | Bin 0 -> 13301 bytes .../customitems/flipable/doc/src/flipable.qdoc | 49 +++++++++++++++++++ .../quick/customitems/flipable/flipable.qmlproject | 16 +++++++ .../scrollbar/doc/images/qml-scrollbar-example.png | Bin 0 -> 159568 bytes .../customitems/scrollbar/doc/src/scrollbar.qdoc | 37 ++++++++++++++ .../tabwidget/doc/images/qml-tabwidget-example.png | Bin 0 -> 5298 bytes .../quick/customitems/tabwidget/doc/images/tab.png | Bin 0 -> 507 bytes .../customitems/tabwidget/doc/src/tabwidget.qdoc | 40 ++++++++++++++++ examples/quick/customitems/tabwidget/tab.png | Bin 507 -> 0 bytes .../doc/images/qml-imageprovider-example.png | Bin 0 -> 2259 bytes .../quick/imageprovider/doc/src/imageprovider.qdoc | 37 ++++++++++++++ .../doc/src/threadedlistmodel.qdoc | 35 ++++++++++++++ .../quick/threading/workerscript/workerscript.js | 40 ++++++++++++++++ .../threading/workerscript/workerscript.qmlproject | 40 ++++++++++++++++ examples/quick/views/doc/src/views.qdoc | 2 +- 19 files changed, 403 insertions(+), 1 deletion(-) create mode 100644 examples/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc create mode 100644 examples/quick/customitems/dialcontrol/dialcontrol.qmlproject create mode 100644 examples/quick/customitems/dialcontrol/doc/images/qml-dialcontrol-example.png create mode 100644 examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc create mode 100644 examples/quick/customitems/flipable/doc/images/qml-flipable-example.png create mode 100644 examples/quick/customitems/flipable/doc/src/flipable.qdoc create mode 100644 examples/quick/customitems/flipable/flipable.qmlproject create mode 100644 examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png create mode 100644 examples/quick/customitems/scrollbar/doc/src/scrollbar.qdoc create mode 100644 examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png create mode 100644 examples/quick/customitems/tabwidget/doc/images/tab.png create mode 100644 examples/quick/customitems/tabwidget/doc/src/tabwidget.qdoc delete mode 100644 examples/quick/customitems/tabwidget/tab.png create mode 100644 examples/quick/imageprovider/doc/images/qml-imageprovider-example.png create mode 100644 examples/quick/imageprovider/doc/src/imageprovider.qdoc create mode 100644 examples/quick/threading/threadedlistmodel/doc/src/threadedlistmodel.qdoc (limited to 'examples') diff --git a/examples/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc b/examples/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc new file mode 100644 index 0000000000..a4d4acd715 --- /dev/null +++ b/examples/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** 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. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title C++ Extensions: Network Access Manager Factory Example + \example networkaccessmanagerfactory + + This example shows how to use QQmlNetworkAccessManagerFactory to create a QNetworkAccessManager + with a proxy. + + Usage: + networkaccessmanagerfactory [-host -port ] [file] +*/ + diff --git a/examples/quick/customitems/dialcontrol/dialcontrol.qmlproject b/examples/quick/customitems/dialcontrol/dialcontrol.qmlproject new file mode 100644 index 0000000000..4056ad87ef --- /dev/null +++ b/examples/quick/customitems/dialcontrol/dialcontrol.qmlproject @@ -0,0 +1,17 @@ +import QmlProject 1.1 + +Project { + mainFile: "dialcontrol.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } +} + diff --git a/examples/quick/customitems/dialcontrol/doc/images/qml-dialcontrol-example.png b/examples/quick/customitems/dialcontrol/doc/images/qml-dialcontrol-example.png new file mode 100644 index 0000000000..74cd645d3a Binary files /dev/null and b/examples/quick/customitems/dialcontrol/doc/images/qml-dialcontrol-example.png differ diff --git a/examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc b/examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc new file mode 100644 index 0000000000..f0c5863526 --- /dev/null +++ b/examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** 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 Digia Plc 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$ +** +****************************************************************************/ + + +/*! + \title UI Components: Dial Control Example + \example customitems/dialcontrol + + This example shows how to create a dial-type control. It combines + \l Image elements with \l Rotation transforms and \l SpringAnimation behaviors + to produce an interactive speedometer-type dial. + + \image qml-dialcontrol-example.png +*/ + + diff --git a/examples/quick/customitems/flipable/doc/images/qml-flipable-example.png b/examples/quick/customitems/flipable/doc/images/qml-flipable-example.png new file mode 100644 index 0000000000..dd68a66cef Binary files /dev/null and b/examples/quick/customitems/flipable/doc/images/qml-flipable-example.png differ diff --git a/examples/quick/customitems/flipable/doc/src/flipable.qdoc b/examples/quick/customitems/flipable/doc/src/flipable.qdoc new file mode 100644 index 0000000000..7ee5fba73a --- /dev/null +++ b/examples/quick/customitems/flipable/doc/src/flipable.qdoc @@ -0,0 +1,49 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** 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 Digia Plc 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$ +** +****************************************************************************/ + +/*! + \title UI Components: Flipable Example + \example customitems/flipable + + This example shows how to use the \l Flipable element. + + \image qml-flipable-example.png +*/ + diff --git a/examples/quick/customitems/flipable/flipable.qmlproject b/examples/quick/customitems/flipable/flipable.qmlproject new file mode 100644 index 0000000000..68718b2e69 --- /dev/null +++ b/examples/quick/customitems/flipable/flipable.qmlproject @@ -0,0 +1,16 @@ +import QmlProject 1.1 + +Project { + mainFile: "flipable.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } +} diff --git a/examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png b/examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png new file mode 100644 index 0000000000..54adf33daa Binary files /dev/null and b/examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png differ diff --git a/examples/quick/customitems/scrollbar/doc/src/scrollbar.qdoc b/examples/quick/customitems/scrollbar/doc/src/scrollbar.qdoc new file mode 100644 index 0000000000..7847692e73 --- /dev/null +++ b/examples/quick/customitems/scrollbar/doc/src/scrollbar.qdoc @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** 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. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ +/*! + \title UI Components: Scroll Bar Example + \example customitems/scrollbar + + This example shows how to create scroll bars for a \l Flickable element + using the \l {Flickable::visibleArea.xPosition}{Flickable::visibleArea} + properties. + + \image qml-scrollbar-example.png +*/ + diff --git a/examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png b/examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png new file mode 100644 index 0000000000..847052d301 Binary files /dev/null and b/examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png differ diff --git a/examples/quick/customitems/tabwidget/doc/images/tab.png b/examples/quick/customitems/tabwidget/doc/images/tab.png new file mode 100644 index 0000000000..ad8021605f Binary files /dev/null and b/examples/quick/customitems/tabwidget/doc/images/tab.png differ diff --git a/examples/quick/customitems/tabwidget/doc/src/tabwidget.qdoc b/examples/quick/customitems/tabwidget/doc/src/tabwidget.qdoc new file mode 100644 index 0000000000..9aefd96e92 --- /dev/null +++ b/examples/quick/customitems/tabwidget/doc/src/tabwidget.qdoc @@ -0,0 +1,40 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** 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. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title TabWidget Example + \example customitems/tabwidget + + This example shows how to create a tab widget. It also demonstrates how + \l {Property aliases}{property aliases} and + \l {QML Object Attributes#Default Properties}{default properties} can be used to collect and + assemble the child items declared within an \l Item. + + \image qml-tabwidget-example.png +*/ + + diff --git a/examples/quick/customitems/tabwidget/tab.png b/examples/quick/customitems/tabwidget/tab.png deleted file mode 100644 index ad8021605f..0000000000 Binary files a/examples/quick/customitems/tabwidget/tab.png and /dev/null differ diff --git a/examples/quick/imageprovider/doc/images/qml-imageprovider-example.png b/examples/quick/imageprovider/doc/images/qml-imageprovider-example.png new file mode 100644 index 0000000000..e82548ae81 Binary files /dev/null and b/examples/quick/imageprovider/doc/images/qml-imageprovider-example.png differ diff --git a/examples/quick/imageprovider/doc/src/imageprovider.qdoc b/examples/quick/imageprovider/doc/src/imageprovider.qdoc new file mode 100644 index 0000000000..d25eeae672 --- /dev/null +++ b/examples/quick/imageprovider/doc/src/imageprovider.qdoc @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** 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. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title C++ Extensions: Image Provider Example + \example imageprovider + + This examples shows how to use QQuickImageProvider to serve images + to QML image elements. + + \image qml-imageprovider-example.png +*/ + diff --git a/examples/quick/threading/threadedlistmodel/doc/src/threadedlistmodel.qdoc b/examples/quick/threading/threadedlistmodel/doc/src/threadedlistmodel.qdoc new file mode 100644 index 0000000000..de7b2a49a2 --- /dev/null +++ b/examples/quick/threading/threadedlistmodel/doc/src/threadedlistmodel.qdoc @@ -0,0 +1,35 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** 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. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title Threaded ListModel Example + \example threading/threadedlistmodel + + This example shows how to use a ListModel from multiple threads using + WorkerScript. +*/ + diff --git a/examples/quick/threading/workerscript/workerscript.js b/examples/quick/threading/workerscript/workerscript.js index 67fbd8af9a..0a6a37ef29 100644 --- a/examples/quick/threading/workerscript/workerscript.js +++ b/examples/quick/threading/workerscript/workerscript.js @@ -1,3 +1,43 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** 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 Digia Plc 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$ +** +****************************************************************************/ + //Will be initialized when WorkerScript{} is instantiated var cache = new Array(64); for (var i = 0; i < 64; i++) diff --git a/examples/quick/threading/workerscript/workerscript.qmlproject b/examples/quick/threading/workerscript/workerscript.qmlproject index 6d7a91feeb..05c5cf4756 100644 --- a/examples/quick/threading/workerscript/workerscript.qmlproject +++ b/examples/quick/threading/workerscript/workerscript.qmlproject @@ -1,3 +1,43 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** 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 Digia Plc 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 QmlProject 1.1 Project { diff --git a/examples/quick/views/doc/src/views.qdoc b/examples/quick/views/doc/src/views.qdoc index d25d9f40c9..0e91bfe78c 100644 --- a/examples/quick/views/doc/src/views.qdoc +++ b/examples/quick/views/doc/src/views.qdoc @@ -68,7 +68,7 @@ \section1 Highlight - \e Highlight demonstrates adding a custom highlight to a \l ListView. + \e Highlight demonstrates adding a custom highlight to a ListView. \snippet views/listview/highlight.qml 0 \section1 Highlight Ranges -- cgit v1.2.3