diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2014-07-15 15:40:04 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-07-24 14:24:55 +0200 |
| commit | c746f9b321dc135e7ef74ea1a24a246c9f2ae3cc (patch) | |
| tree | d2d8f42b5eb2a436ae5ca0bb39d7032c443d6f61 /src/quick/doc/src/concepts/visualtypes/topic.qdoc | |
| parent | a7fbb1cb059ffa42fa3e2c69775a3a4c7f650cc3 (diff) | |
Doc: Merged two pages titled "Qt Quick QML Types".
-kept the \qmlmodule page.
-there are two pages with the same titles and it is difficult
to discern between the two.
-the grouping is lost, but those can be restored in either the use case
or concept topic pages.
-modified landing page and other pages which link to the unmerged
document.
Change-Id: I58468c22f0621506e477f30ae2411a382d57b982
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/quick/doc/src/concepts/visualtypes/topic.qdoc')
| -rw-r--r-- | src/quick/doc/src/concepts/visualtypes/topic.qdoc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/quick/doc/src/concepts/visualtypes/topic.qdoc b/src/quick/doc/src/concepts/visualtypes/topic.qdoc index af8e673640..d30c7767c0 100644 --- a/src/quick/doc/src/concepts/visualtypes/topic.qdoc +++ b/src/quick/doc/src/concepts/visualtypes/topic.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. @@ -36,9 +36,7 @@ for example, haptic feedback and sounds to notify the user of changes in the state of an application), visual objects in a user-interface are able to convey a huge amount of information to the user at a glance. -See the \l{qtquick-qmltypereference.html}{Qt Quick QML type reference} for the -complete list of visual object types provided by Qt Quick. +See the \l{Qt Quick QML Types} page for the complete list of visual object types +provided by Qt Quick. */ - - |