aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2021-06-15 15:21:51 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-06-16 12:27:24 +0000
commitfb446f0610b8341ebd0bb07a6008c965dd92db2b (patch)
tree8d694e24e48478305bdc426623e4665df274835f
parent23e6cb8061debe975ff8c184fe9d4c16294b1bae (diff)
Doc: Fix more documentation issues
* Screen QML type is moved under the main QtQuick import * XmlListModel types are their own documentation project, add a dependency to qtquick.qdocconf. * Remove QDoc comment identifiers from internal, undocumented class. * Fix linking to Qt Creator manual. * Fix linking to QtQuick3D.Model. Change-Id: I3b48165c04ef84288472963e39eafc0868c14c49 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 5a34509af924fb49579c6344856e2236834e2aae) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/quick/accessible/qaccessiblequickitem.cpp22
-rw-r--r--src/quick/doc/qtquick.qdocconf1
-rw-r--r--src/quick/doc/src/examples.qdoc2
-rw-r--r--src/quick/handlers/qquickpointerhandler.cpp4
-rw-r--r--src/quick/items/qquickscreen.cpp2
5 files changed, 16 insertions, 15 deletions
diff --git a/src/quick/accessible/qaccessiblequickitem.cpp b/src/quick/accessible/qaccessiblequickitem.cpp
index 5e3a1108d6..933a5b5cbe 100644
--- a/src/quick/accessible/qaccessiblequickitem.cpp
+++ b/src/quick/accessible/qaccessiblequickitem.cpp
@@ -145,7 +145,7 @@ QWindow *QAccessibleHyperlink::window() const
}
-/*! \reimp */
+/* \reimp */
QRect QAccessibleHyperlink::rect() const
{
const QVector<QQuickTextPrivate::LinkDesc> links = QQuickTextPrivate::get(textItem())->getLinks();
@@ -156,37 +156,37 @@ QRect QAccessibleHyperlink::rect() const
return QRect();
}
-/*! \reimp */
+/* \reimp */
QAccessibleInterface *QAccessibleHyperlink::childAt(int, int) const
{
return nullptr;
}
-/*! \reimp */
+/* \reimp */
QAccessibleInterface *QAccessibleHyperlink::parent() const
{
return QAccessible::queryAccessibleInterface(textItem());
}
-/*! \reimp */
+/* \reimp */
QAccessibleInterface *QAccessibleHyperlink::child(int) const
{
return nullptr;
}
-/*! \reimp */
+/* \reimp */
int QAccessibleHyperlink::childCount() const
{
return 0;
}
-/*! \reimp */
+/* \reimp */
int QAccessibleHyperlink::indexOfChild(const QAccessibleInterface *) const
{
return -1;
}
-/*! \reimp */
+/* \reimp */
QAccessible::State QAccessibleHyperlink::state() const
{
QAccessible::State s;
@@ -197,13 +197,13 @@ QAccessible::State QAccessibleHyperlink::state() const
return s;
}
-/*! \reimp */
+/* \reimp */
QAccessible::Role QAccessibleHyperlink::role() const
{
return QAccessible::Link;
}
-/*! \reimp */
+/* \reimp */
QString QAccessibleHyperlink::text(QAccessible::Text t) const
{
// AT servers have different behaviors:
@@ -221,13 +221,13 @@ QString QAccessibleHyperlink::text(QAccessible::Text t) const
return QString();
}
-/*! \reimp */
+/* \reimp */
void QAccessibleHyperlink::setText(QAccessible::Text, const QString &)
{
}
-/*! \reimp */
+/* \reimp */
void *QAccessibleHyperlink::interface_cast(QAccessible::InterfaceType t)
{
if (t == QAccessible::HyperlinkInterface)
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index 7340413d3f..7875b5bd8e 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -42,6 +42,7 @@ depends += \
qtcore \
qtqml \
qtqmlmodels \
+ qtqmlxmllistmodel \
qtqmltest \
qtgui \
qtlinguist \
diff --git a/src/quick/doc/src/examples.qdoc b/src/quick/doc/src/examples.qdoc
index 29f7a02618..b0cfa247ec 100644
--- a/src/quick/doc/src/examples.qdoc
+++ b/src/quick/doc/src/examples.qdoc
@@ -78,7 +78,7 @@ steps such as use cases and introductory material. For more information about Qt
\list
\li \l{Qt Creator: Creating Qt Quick Projects}{Creating Qt Quick Projects}
\li \l{Qt Creator: Creating Components}{Creating Components}
- \li \l{Qt Creator: Exporting from Design Tools}{Exporting from Design Tools}
+ \li \l{Qt Creator: Exporting QML}{Exporting Components}
\li \l{Qt Creator: Using QML Modules with Plugins}{Using QML Modules with Plugins}
\endlist
\enddiv
diff --git a/src/quick/handlers/qquickpointerhandler.cpp b/src/quick/handlers/qquickpointerhandler.cpp
index c1b20b1388..597ce17c35 100644
--- a/src/quick/handlers/qquickpointerhandler.cpp
+++ b/src/quick/handlers/qquickpointerhandler.cpp
@@ -722,8 +722,8 @@ void QQuickPointerHandler::handlePointerEventImpl(QPointerEvent *event)
the Item's interior. Initially \l [QML] {target} {target()} is the same, but it
can be reassigned.
- \note When a handler is declared in a \l QtQuick3D.Model object, the parent
- is not an Item, therefore this property is \c null.
+ \note When a handler is declared in a \l [QtQuick3D] {Model}{QtQuick3D.Model}
+ object, the parent is not an Item, therefore this property is \c null.
\sa {target}, QObject::parent()
*/
diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp
index ffe8169381..913003ef15 100644
--- a/src/quick/items/qquickscreen.cpp
+++ b/src/quick/items/qquickscreen.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmltype Screen
\instantiates QQuickScreenAttached
- \inqmlmodule QtQuick.Window
+ \inqmlmodule QtQuick
\ingroup qtquick-visual-utility
\brief The Screen attached object provides information about the Screen an Item or Window is displayed on.