diff options
53 files changed, 459 insertions, 59 deletions
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 <proxy> -port <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 Binary files differnew file mode 100644 index 0000000000..74cd645d3a --- /dev/null +++ b/examples/quick/customitems/dialcontrol/doc/images/qml-dialcontrol-example.png 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 Binary files differnew file mode 100644 index 0000000000..dd68a66cef --- /dev/null +++ b/examples/quick/customitems/flipable/doc/images/qml-flipable-example.png 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 Binary files differnew file mode 100644 index 0000000000..54adf33daa --- /dev/null +++ b/examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png 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 Binary files differnew file mode 100644 index 0000000000..847052d301 --- /dev/null +++ b/examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png diff --git a/examples/quick/customitems/tabwidget/tab.png b/examples/quick/customitems/tabwidget/doc/images/tab.png Binary files differindex ad8021605f..ad8021605f 100644 --- a/examples/quick/customitems/tabwidget/tab.png +++ b/examples/quick/customitems/tabwidget/doc/images/tab.png 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/imageprovider/doc/images/qml-imageprovider-example.png b/examples/quick/imageprovider/doc/images/qml-imageprovider-example.png Binary files differnew file mode 100644 index 0000000000..e82548ae81 --- /dev/null +++ b/examples/quick/imageprovider/doc/images/qml-imageprovider-example.png 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 diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index d5dbeeb4c2..5fe445758b 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -554,7 +554,7 @@ The API can be used from JavaScript functions in your QML: The API conforms to the Synchronous API of the HTML5 Web Database API, \link http://www.w3.org/TR/2009/WD-webdatabase-20091029/ W3C Working Draft 29 October 2009\endlink. -The \l{localstorage/localstorage}{SQL Local Storage example} demonstrates the basics of +The \l{Qt Quick Examples - Local Storage}{SQL Local Storage example} demonstrates the basics of using the Offline Storage API. \section3 Open or create a databaseData diff --git a/src/quick/doc/images/visualitemmodel.png b/src/qml/doc/images/visualitemmodel.png Binary files differindex 5e6d1325b2..5e6d1325b2 100644 --- a/src/quick/doc/images/visualitemmodel.png +++ b/src/qml/doc/images/visualitemmodel.png diff --git a/src/qml/doc/src/qmllanguageref/modules/cppplugins.qdoc b/src/qml/doc/src/qmllanguageref/modules/cppplugins.qdoc index 8bfe309144..a481847136 100644 --- a/src/qml/doc/src/qmllanguageref/modules/cppplugins.qdoc +++ b/src/qml/doc/src/qmllanguageref/modules/cppplugins.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. @@ -120,7 +120,7 @@ \snippet qmlextensionplugins/plugins.qml 0 - The full source code is available in the \l {qml/qmlextensionplugins}{plugins example}. + The full source code is available in the \l {qmlextensionplugins}{plugins example}. \section1 Reference diff --git a/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc b/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc index 78b16a0a0d..e66a296a82 100644 --- a/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc +++ b/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. @@ -265,10 +265,6 @@ version of installed software, since a versioned import \e only imports types for that version, leaving other identifiers available, even if the actual installed version might otherwise provide those identifiers. -See \l{examples/qml/plugins} for an example that uses C++ -plugins. - - \section1 Example of a qmldir File One example of a \c qmldir file follows: diff --git a/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc b/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc index 3e48ec2308..dd42e251c2 100644 --- a/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc +++ b/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. @@ -562,9 +562,9 @@ any items added to this list for an \l Item are automatically added to its list of \l {Item::children}{children}. Default properties can be useful for reassigning the children of an item. See -the \l{declarative/customitems/tabwidget}{TabWidget example}, which uses a -default property to automatically reassign children of the TabWidget as -children of an inner ListView. +the \l{TabWidget Example}, which uses a default property to +automatically reassign children of the TabWidget as children of an inner +ListView. \section3 Read-Only Properties diff --git a/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc b/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc index c1c2c0f5db..16e36f6f6d 100644 --- a/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc +++ b/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. @@ -498,6 +498,7 @@ property is only invoked when the property is reassigned to a different object v "destroy" method on the \c var property from within JavaScript. They may also explicitly preserve the scarce resource by calling the "preserve" method on the \c var property from within JavaScript. + For more information regarding the usage of a scarce resource, please see \l{Scarce Resources in JavaScript}. @@ -542,7 +543,7 @@ property is only invoked when the property is reassigned to a different object v "destroy" method on the \c variant property from within JavaScript. They may also explicitly preserve the scarce resource by calling the "preserve" method on the \c variant property from within JavaScript. - For more information regarding the usage of a scarce resource, please + For more information on the usage of a scarce resource, please see \l{Scarce Resources in JavaScript}. \section1 Storing Arrays and Objects diff --git a/src/qml/doc/src/whatsnew.qdoc b/src/qml/doc/src/whatsnew.qdoc index f13a4dac1d..10e7108207 100644 --- a/src/qml/doc/src/whatsnew.qdoc +++ b/src/qml/doc/src/whatsnew.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. @@ -94,7 +94,8 @@ has now been replaced by the new \l {Qt QML} and \l {Qt Quick} modules. See the \list \li New \l var property type. This is a general-purpose property type which obsoletes the \l variant type. Properties of the \l var type may hold JavaScript references. -\li QML properties of type \l var and \l variant can now hold pixmaps. See \l {Scarce Resources in JavaScript} for more information. +\li QML properties of type \l var and \l variant can now hold pixmaps. + See \l {Scarce Resources in JavaScript} for more information. \li Value type improvements: \list \li QML now supports defining properties of value type basic types within QML documents. Supported types include diff --git a/src/qml/qml/qqmlextensionplugin.cpp b/src/qml/qml/qqmlextensionplugin.cpp index f3d1ba9d41..1c321d131d 100644 --- a/src/qml/qml/qqmlextensionplugin.cpp +++ b/src/qml/qml/qqmlextensionplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -116,7 +116,7 @@ QT_BEGIN_NAMESPACE \snippet qmlextensionplugins/plugins.qml 0 - The full source code is available in the \l {qml/qmlextensionplugins}{plugins example}. + The full source code is available in the \l {qmlextensionplugins}{plugins example}. The \l {Writing QML Extensions with C++} tutorial also contains a chapter on creating QML plugins. diff --git a/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp b/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp index b0271b11f2..9d808f56d9 100644 --- a/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp +++ b/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -82,7 +82,7 @@ QT_BEGIN_NAMESPACE The \l {Qt Quick 1} version of this class is named QDeclarativeNetworkAccessManagerFactory. - \sa {qml/networkaccessmanagerfactory}{NetworkAccessManagerFactory example} + \sa {C++ Extensions: Network Access Manager Factory Example}{Network Access Manager Factory Example} */ /*! diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp index f57d4a6a58..be49b6e5a0 100644 --- a/src/qml/types/qqmllistmodel.cpp +++ b/src/qml/types/qqmllistmodel.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -1526,7 +1526,7 @@ QQmlListModelParser::ListInstruction *QQmlListModelParser::ListModelData::instru You must call sync() or else the changes made to the list from that thread will not be reflected in the list model in the main thread. - \sa {qml-data-models}{Data Models}, {declarative/threading/threadedlistmodel}{Threaded ListModel example}, {Qt QML} + \sa {qml-data-models}{Data Models}, {Qt Quick Examples - Threading}, {Qt QML} */ QQmlListModel::QQmlListModel(QObject *parent) diff --git a/src/qml/types/qqmlobjectmodel.cpp b/src/qml/types/qqmlobjectmodel.cpp index d4dbae383d..ca9f25ff59 100644 --- a/src/qml/types/qqmlobjectmodel.cpp +++ b/src/qml/types/qqmlobjectmodel.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -164,7 +164,7 @@ public: \image visualitemmodel.png - \sa {quick/views/objectmodel}{ObjectModel example} + \sa {Qt Quick Examples - Views} */ /*! \qmltype VisualItemModel diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp index 80c4112930..4e842c5133 100644 --- a/src/qml/types/qquickworkerscript.cpp +++ b/src/qml/types/qquickworkerscript.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -623,8 +623,8 @@ void QQuickWorkerScriptEngine::run() Worker script can not use \l {qtqml-javascript-imports.html}{.import} syntax. - \sa {declarative/threading/workerscript}{WorkerScript example}, - {declarative/threading/threadedlistmodel}{Threaded ListModel example} + \sa {Qt Quick Examples - Threading}, + {Threaded ListModel Example} */ QQuickWorkerScript::QQuickWorkerScript(QObject *parent) : QObject(parent), m_engine(0), m_scriptId(-1), m_componentComplete(true) diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index edad14cfd4..959a54b7d8 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -67,6 +67,8 @@ excludedirs += ../../imports/dialogs \ ../../imports/models \ ../../../examples/quick/dialogs +manifestmeta.thumbnail.names += "QtQuick/Threaded ListModel Example" + navigation.landingpage = "Qt Quick" navigation.cppclassespage = "Qt Quick C++ Classes" navigation.qmltypespage = "Qt Quick QML Types" diff --git a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc index f1e13e127c..49e4998ee1 100644 --- a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc +++ b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc @@ -57,7 +57,7 @@ to a QStringList: \snippet models/stringlistmodel/main.cpp 0 The complete source code for this example is available in -\l {quick/modelviews/stringlistmodel}{examples/quick/modelviews/stringlistmodel} +\l {models/stringlistmodel}{examples/quick/models/stringlistmodel} within the Qt install directory. \b{Note:} There is no way for the view to know that the contents of a QStringList @@ -94,7 +94,7 @@ object, as they are easily available via the \c modelData object. The complete source code for this example is available in -\l {quick/modelviews/objectlistmodel}{examples/quick/modelviews/objectlistmodel} +\l {models/objectlistmodel}{examples/quick/models/objectlistmodel} within the Qt install directory. Note: There is no way for the view to know that the contents of a QList @@ -140,7 +140,7 @@ QAbstractItemModel::beginInsertRows(), and so on. See the \l {Model subclassing more information. The complete source code for this example is available in -\l {quick/modelviews/abstractitemmodel}{examples/quick/modelviews/abstractitemmodel} +\l {models/abstractitemmodel}{examples/quick/models/abstractitemmodel} within the Qt install directory. QAbstractItemModel presents a hierarchy of tables, but the views currently provided by QML diff --git a/src/quick/doc/src/concepts/statesanimations/animations.qdoc b/src/quick/doc/src/concepts/statesanimations/animations.qdoc index e4e208863b..080b786f9b 100644 --- a/src/quick/doc/src/concepts/statesanimations/animations.qdoc +++ b/src/quick/doc/src/concepts/statesanimations/animations.qdoc @@ -183,7 +183,7 @@ There are several methods of assigning behavior animations to properties. The \c{Behavior on <property>} declaration is a convenient way of assigning a behavior animation onto a property. -See the \l {declarative/animation/behaviors}{Behaviors example} for a +See the \l {Qt Quick Examples - Animation} for a demonstration of behavioral animations. \section1 Playing Animations in Parallel or in Sequence @@ -235,7 +235,7 @@ are also different parameters to control the curve, some of which are exclusive to a particular curve. For more information about the easing curves, visit the \l {PropertyAnimation::easing.type}{easing} documentation. -The \l{declarative/animation/easing}{easing example} visually demonstrates each +The \l{animation/easing}{easing example} visually demonstrates each of the different easing types. \section2 Other Animation Types diff --git a/src/quick/doc/src/concepts/statesanimations/states.qdoc b/src/quick/doc/src/concepts/statesanimations/states.qdoc index d9978d454e..b0d7765c66 100644 --- a/src/quick/doc/src/concepts/statesanimations/states.qdoc +++ b/src/quick/doc/src/concepts/statesanimations/states.qdoc @@ -121,7 +121,7 @@ interpolation behaviors are definable. The {Animation and Transitions} article has more information about creating state animations. -The \l {declarative/animation/states}{States and Transitions example} +The \l {animation/states}{States and Transitions example} demonstrates how to declare a basic set of states and apply animated transitions between them. diff --git a/src/quick/doc/src/examples.qdoc b/src/quick/doc/src/examples.qdoc index 3669a31de0..51525b8f57 100644 --- a/src/quick/doc/src/examples.qdoc +++ b/src/quick/doc/src/examples.qdoc @@ -126,7 +126,7 @@ Creator. \list \li \l{Qt Quick Controls - Gallery}{Controls Gallery} \li \l{Qt Quick System Dialog Examples}{Dialog Examples} - \li \l{Qt Quick Controls - Calendar Example}{Calendar Example} + \li \l{Calendar Example} \li \l{Qt Quick Controls - Table View Example}{TableView} \li \l{Qt Quick Examples - Text}{Text and Fonts} \li \l{Qt Quick Examples - Toggle Switch}{Custom Toggle Switch} diff --git a/src/quick/doc/src/tutorial.qdoc b/src/quick/doc/src/tutorial.qdoc index 75ca1b8d55..91032f1d92 100644 --- a/src/quick/doc/src/tutorial.qdoc +++ b/src/quick/doc/src/tutorial.qdoc @@ -223,5 +223,5 @@ This is equivalent to writing the two transitions separately. The \l ParallelAnimation type makes sure that the two types of animations (number and color) start at the same time. We could also run them one after the other by using \l SequentialAnimation instead. -For more details on states and transitions, see \l {Qt Quick States} and the \l{quick/animation/states}{states and transitions example}. +For more details on states and transitions, see \l {Qt Quick States} and the \l{animation/states}{states and transitions example}. */ diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp index b4a89b3107..16c8d94e8d 100644 --- a/src/quick/items/qquickborderimage.cpp +++ b/src/quick/items/qquickborderimage.cpp @@ -138,7 +138,7 @@ QT_BEGIN_NAMESPACE to use \l{BorderImage::horizontalTileMode}{BorderImage.Round} instead of \l{BorderImage::horizontalTileMode}{BorderImage.Repeat} in cases like these. - The \l{declarative/imageelements/borderimage}{BorderImage example} shows how a BorderImage + The Border Image example in \l{Qt Quick Examples - Image Elements} shows how a BorderImage can be used to simulate a shadow effect on a rectangular item. \section1 Image Loading diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index d12a7554bb..45566f2e89 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -677,7 +677,7 @@ is finished. \dots 8 \snippet qml/flickableScrollbar.qml 1 - \sa {declarative/customitems/scrollbar}{scrollbar example} + \sa {customitems/scrollbar}{UI Components: Scrollbar Example} */ QQuickFlickable::QQuickFlickable(QQuickItem *parent) : QQuickItem(*(new QQuickFlickablePrivate), parent) diff --git a/src/quick/items/qquickflipable.cpp b/src/quick/items/qquickflipable.cpp index 1ea5e57656..63466cf52d 100644 --- a/src/quick/items/qquickflipable.cpp +++ b/src/quick/items/qquickflipable.cpp @@ -127,7 +127,7 @@ public: state, and \l {Animation and Transitions in Qt Quick} for more information on how animations work within transitions. - \sa {declarative/customitems/flipable}{Flipable example} + \sa {customitems/flipable}{UI Components: Flipable Example} */ QQuickFlipable::QQuickFlipable(QQuickItem *parent) : QQuickItem(*(new QQuickFlipablePrivate), parent) diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp index d7527742dc..781fcccd9f 100644 --- a/src/quick/items/qquickimage.cpp +++ b/src/quick/items/qquickimage.cpp @@ -153,7 +153,7 @@ QQuickImagePrivate::QQuickImagePrivate() size bounded via the \l sourceSize property. This is especially important for content that is loaded from external sources or provided by the user. - \sa {declarative/imageelements/image}{Image example}, QQuickImageProvider + \sa {Qt Quick Examples - Image Elements}, QQuickImageProvider */ QQuickImage::QQuickImage(QQuickItem *parent) @@ -277,7 +277,7 @@ void QQuickImagePrivate::setImage(const QImage &image) Note that \c clip is \c false by default which means that the item might paint outside its bounding rectangle even if the fillMode is set to \c PreserveAspectCrop. - \sa {declarative/imageelements/image}{Image example} + \sa {Qt Quick Examples - Image Elements} */ QQuickImage::FillMode QQuickImage::fillMode() const { diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp index ba4f1c53ba..c496eab3c5 100644 --- a/src/quick/items/qquicklistview.cpp +++ b/src/quick/items/qquicklistview.cpp @@ -1937,7 +1937,7 @@ QQuickListView::~QQuickListView() highlight item is \c 0. \sa highlightItem, highlightFollowsCurrentItem, - {Qt Quick Examples - Views#Highlight demonstrates adding a custom highlight to a ListView.}{ListView highlight example} + {Qt Quick Examples - Views#Highlight}{ListView highlight example} */ /*! @@ -2252,7 +2252,7 @@ void QQuickListView::setOrientation(QQuickListView::Orientation orientation) differing sections will result in a section header being created even if that section exists elsewhere. - \sa {quick/views/listview}{ListView examples} + \sa {Qt Quick Examples - Views}{ListView examples} */ QQuickViewSection *QQuickListView::sectionCriteria() { diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp index d4b64ea75a..bac52f04f8 100644 --- a/src/quick/items/qquickmousearea.cpp +++ b/src/quick/items/qquickmousearea.cpp @@ -253,7 +253,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i \snippet qml/mousearea/mousearea.qml intro-extended - \sa MouseEvent, {declarative/touchinteraction/mousearea}{MouseArea example}, + \sa MouseEvent, {mousearea}{MouseArea example}, {Important Concepts In Qt Quick - User Input} */ diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index cbdea3917a..7a4027890c 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -1227,7 +1227,7 @@ void QQuickTextPrivate::ensureDoc() Text provides read-only text. For editable text, see \l TextEdit. - \sa {declarative/text/fonts}{Fonts example} + \sa {Qt Quick Examples - Text#Fonts}{Fonts example} */ QQuickText::QQuickText(QQuickItem *parent) : QQuickImplicitSizeItem(*(new QQuickTextPrivate), parent) diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 5280301675..b042e30483 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -112,7 +112,7 @@ TextEdit { You can translate between cursor positions (characters from the start of the document) and pixel points using positionAt() and positionToRectangle(). - \sa Text, TextInput, {examples/quick/text/textselection}{Text Selection example} + \sa Text, TextInput */ /*! diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index 597025b796..b70e292026 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -87,7 +87,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD) On Mac OS X, the Up/Down key bindings for Home/End are explicitly disabled. If you want such bindings (on any platform), you will need to construct them in QML. - \sa TextEdit, Text, {declarative/text/textselection}{Text Selection example} + \sa TextEdit, Text */ QQuickTextInput::QQuickTextInput(QQuickItem* parent) : QQuickImplicitSizeItem(*(new QQuickTextInputPrivate), parent) diff --git a/src/quick/items/qquicktranslate.cpp b/src/quick/items/qquicktranslate.cpp index 14f8c204f3..ebf9f616a2 100644 --- a/src/quick/items/qquicktranslate.cpp +++ b/src/quick/items/qquicktranslate.cpp @@ -336,7 +336,7 @@ public: \image axisrotation.png - \sa {declarative/customitems/dialcontrol}{Dial Control example}, {Qt Quick Demo - Clocks} + \sa {customitems/dialcontrol}{Dial Control example}, {Qt Quick Demo - Clocks} */ QQuickRotation::QQuickRotation(QObject *parent) : QQuickTransform(*new QQuickRotationPrivate, parent) diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index 10d2176d0a..544e2d4daa 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -2344,8 +2344,7 @@ void QQuickPropertyAnimation::setTo(const QVariant &t) groups of three points defining a curve from 0,0 to 1,1 - control1, control2, end point: [cx1, cy1, cx2, cy2, endx, endy, ...]. The last point must be 1,1. - See the \l {qml/animation/easing}{easing} example for a demonstration of - the different easing settings. + See the \l {Qt Quick Examples - Animation#Easing Curves}{Easing Curves} for a demonstration of the different easing settings. //! propertyanimation.easing */ QEasingCurve QQuickPropertyAnimation::easing() const diff --git a/src/quick/util/qquickbehavior.cpp b/src/quick/util/qquickbehavior.cpp index 74e5b40ab1..2e37682811 100644 --- a/src/quick/util/qquickbehavior.cpp +++ b/src/quick/util/qquickbehavior.cpp @@ -99,7 +99,7 @@ public: state change. For general advice on using Behaviors to animate state changes, see \l{Using Qt Quick Behaviors with States}. - \sa {Animation and Transitions in Qt Quick}, {declarative/animation/behaviors}{Behavior example}, {Qt QML} + \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation#Behaviors}{Behavior example}, {Qt QML} */ diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp index c0672359ef..26f34b46c6 100644 --- a/src/quick/util/qquickfontloader.cpp +++ b/src/quick/util/qquickfontloader.cpp @@ -170,7 +170,7 @@ QHash<QUrl, QQuickFontObject*> QQuickFontLoaderPrivate::fonts; } \endqml - \sa {declarative/text/fonts}{Fonts example} + \sa {Qt Quick Examples - Text#Fonts}{Qt Quick Examples - Text Fonts} */ QQuickFontLoader::QQuickFontLoader(QObject *parent) : QObject(*(new QQuickFontLoaderPrivate), parent) diff --git a/src/quick/util/qquickimageprovider.cpp b/src/quick/util/qquickimageprovider.cpp index 16c18d2594..24d6ad7a1f 100644 --- a/src/quick/util/qquickimageprovider.cpp +++ b/src/quick/util/qquickimageprovider.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQuick module of the Qt Toolkit. @@ -203,9 +203,8 @@ QImage QQuickTextureFactory::image() const \image imageprovider.png - A complete example is available in Qt's - \l {qml/imageprovider}{examples/quick/imageprovider} - directory. Note the example registers the provider via a \l{QQmlExtensionPlugin}{plugin} + See the \l {imageprovider}{Image Provider Example} for the complete implementation. + Note that the example registers the provider via a \l{QQmlExtensionPlugin}{plugin} instead of registering it in the application \c main() function as shown above. diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp index 882ad66891..0289f46429 100644 --- a/src/quick/util/qquickpropertychanges.cpp +++ b/src/quick/util/qquickpropertychanges.cpp @@ -132,7 +132,7 @@ QT_BEGIN_NAMESPACE changed implicitly through their parent's state, they should be set explicitly in all PropertyChanges. An item will still not be enabled/visible if one of its parents is not enabled or visible. - \sa {declarative/animation/states}{states example}, {Qt Quick States}{Qt Quick States}, {Qt QML} + \sa {Qt Quick Examples - Animation#States}{States example}, {Qt Quick States}, {Qt QML} */ /*! diff --git a/src/quick/util/qquickstate.cpp b/src/quick/util/qquickstate.cpp index 2cc8a4e50d..641dea3dc7 100644 --- a/src/quick/util/qquickstate.cpp +++ b/src/quick/util/qquickstate.cpp @@ -150,7 +150,7 @@ QQuickStateOperation::QQuickStateOperation(QObjectPrivate &dd, QObject *parent) \note Setting the state of an object from within another state of the same object is not allowed. - \sa {declarative/animation/states}{states example}, {Qt Quick States}{Qt Quick States}, + \sa {Qt Quick Examples - Animation#States}{States example}, {Qt Quick States}, {Animation and Transitions in Qt Quick}{Transitions}, {Qt QML} */ QQuickState::QQuickState(QObject *parent) diff --git a/src/quick/util/qquicktransition.cpp b/src/quick/util/qquicktransition.cpp index dcfc4549c2..6d1f646f95 100644 --- a/src/quick/util/qquicktransition.cpp +++ b/src/quick/util/qquicktransition.cpp @@ -96,7 +96,7 @@ QT_BEGIN_NAMESPACE \l Behavior, the Transition animation overrides the \l Behavior for that state change. - \sa {Animation and Transitions in Qt Quick}, {declarative/animation/states}{states example}, {Qt Quick States}{Qt Quick States}, {Qt QML} + \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation#States}{States example}, {Qt Quick States}, {Qt QML} */ //ParallelAnimationWrapper allows us to do a "callback" when the animation finishes, rather than connecting |
