diff options
author | Sze Howe Koh <szehowe.koh@gmail.com> | 2014-02-06 22:09:03 +0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-06 23:31:47 +0100 |
commit | c160190a6faed125d7ada130a28583b7d5861441 (patch) | |
tree | c8f06bf371379c2ed06532a92fda1d43dea95fbf /src/qml | |
parent | b70ab35b21665510a7af85c549964ebe6d39b115 (diff) |
Doc: Merge duplicated example directories
examples/quick/customitems contains all the examples found in
examples/quick/ui-components, plus 2 more (maskedmousearea and
painteditem). There are some very minor differences between the
duplicated files, regarding the "smooth" property. Apart from that, the
examples are identical.
The only file that is unique to examples/quick/ui-components is
example-slideswitch.qdoc. Moving it does not change the generated HTML
filename. The other examples do not produce any documentation.
Change-Id: I507d9064a60fd1f3a1469c1e423d4c0a72c7dc41
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc b/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc index f336d14b14..2a9c94d22e 100644 --- a/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc +++ b/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc @@ -568,7 +568,7 @@ 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/ui-components/tabwidget}{TabWidget example}, which uses a +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. |