From 0e33ba51166dd68a26c56d85a1155c4849d59e4a Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Tue, 11 Dec 2018 12:13:49 +0100 Subject: Doc: Fix link issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I738b9da5335afb048d2eda2edf2be5095a91d7e5 Reviewed-by: Topi Reiniö --- src/quick/doc/qtquick.qdocconf | 2 +- src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc | 4 +--- src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc | 2 +- src/quick/doc/src/examples.qdoc | 2 -- src/quick/doc/src/guidelines/qtquick-toolsnutilities.qdoc | 1 - src/quick/doc/src/qmltypereference.qdoc | 2 +- 6 files changed, 4 insertions(+), 9 deletions(-) (limited to 'src/quick/doc') diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index 8c69eba6a6..21a44a2fab 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -37,7 +37,7 @@ qhp.QtQuick.subprojects.examples.selectors = fake:example tagfile = ../../../doc/qtquick/qtquick.tags -depends += qtcore qtqml qtqmltest qtgui qtlinguist qtquickcontrols qtquickcontrols2 qtdoc qtquickdialogs qtsensors qtwidgets qmake qtmultimedia qtgraphicaleffects qtsql +depends += qtcore qtqml qtqmltest qtgui qtlinguist qtquickcontrols1 qtquickcontrols qtdoc qtquickdialogs qtsensors qtwidgets qmake qtmultimedia qtgraphicaleffects qtsql qtxmlpatterns headerdirs += ..\ ../../quickwidgets diff --git a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc index a849a30b4e..e4d837112f 100644 --- a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc +++ b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc @@ -331,9 +331,7 @@ signal after saving the changes. Unlike the C++ item views such as QListView or QTableView, the \c setData() method must be explicitly invoked from QML delegates whenever appropriate. This is done -by simply assigning a new value to the corresponding model property. For example, -on the \l[QML]{TextField::}{editingFinished}() or \l[QML]{TextField::}{accepted}() -signal of \l[QtQuickControls]{TextField}. +by simply assigning a new value to the corresponding model property. \qml ListView { diff --git a/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc b/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc index 0c6aaecf42..04dbf1cf20 100644 --- a/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc +++ b/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc @@ -226,7 +226,7 @@ To visualize data, bind the view's \c model property to a model and the \section2 XML Model XmlListModel allows construction of a model from an XML data source. The roles - are specified via the \l XmlRole type. The type needs to be imported. + are specified via the \l [QML]{XmlRole} type. The type needs to be imported. \code import QtQuick.XmlListModel 2.0 diff --git a/src/quick/doc/src/examples.qdoc b/src/quick/doc/src/examples.qdoc index 39fc7f27eb..77475e9812 100644 --- a/src/quick/doc/src/examples.qdoc +++ b/src/quick/doc/src/examples.qdoc @@ -77,9 +77,7 @@ steps such as use cases and introductory material. For more information about Qt \b{Development Environment} \list \li \l{Qt Creator: Creating Qt Quick Projects}{Creating Qt Quick Projects} - \li \l{Qt Creator: Using Qt Quick Designer}{Using Qt Quick Designer} \li \l{Qt Creator: Creating Components}{Creating Components} - \li \l{Qt Creator: Creating Screens}{Creating Screens} \li \l{Qt Creator: Exporting Designs from Graphics Software}{Exporting Designs from Graphics Software} \li \l{Qt Creator: Using QML Modules with Plugins}{Using QML Modules with Plugins} \endlist diff --git a/src/quick/doc/src/guidelines/qtquick-toolsnutilities.qdoc b/src/quick/doc/src/guidelines/qtquick-toolsnutilities.qdoc index 5f00abc193..0669ec06c8 100644 --- a/src/quick/doc/src/guidelines/qtquick-toolsnutilities.qdoc +++ b/src/quick/doc/src/guidelines/qtquick-toolsnutilities.qdoc @@ -108,6 +108,5 @@ integrating 3rd party tools such as QmlLive and GammaRay. \section2 Related Information \list \li \l{Qt Creator Manual} -\li \l{Qt Creator: Integrating 3rd Party Tools} \endlist */ diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc index ddf90f88d9..04682c9f33 100644 --- a/src/quick/doc/src/qmltypereference.qdoc +++ b/src/quick/doc/src/qmltypereference.qdoc @@ -49,7 +49,7 @@ information about the concepts which are central to \c QtQuick. Qt Quick includes several submodules which contain additional types. \list - \li \l{Qt Quick XmlListModel QML Types}{XML List Model} - contains types + \li \l{Qt Quick XmlListModel QML Types}{Xml List Model} - contains types for creating models from XML data \li \l{Qt Quick Local Storage QML Types}{Local Storage} - a submodule containing a JavaScript interface for an SQLite database -- cgit v1.2.3