aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/doc
diff options
context:
space:
mode:
authorNicholas Bennett <[email protected]>2025-09-01 13:15:10 +0300
committerNicholas Bennett <[email protected]>2025-09-08 11:30:05 +0000
commitba9f204e12cd0f3dd2ed15d277bbf5cfefc6f2f1 (patch)
tree8e33350d3885f2b0c9dbad951896b38d1de3f247 /src/quick/doc
parent47d331a831b0902c4957225581e72a02c3f954a4 (diff)
Docs: Update existing and add missing links to online Java docs
-Updated QtQuickView and QtQuickViewContent links to new pages. -Added links to QtQmlStatus Enum and QtQmlStatusChangeListener interface classes. -Removed the qdoc QtQuickView file. -Updated links in examples and the main Qt Quick for Android page. Task-number: QTBUG-127747 Fixes: QTBUG-138917 Fixes: QTBUG-123106 Fixes: QTBUG-135474 Pick-to: 6.10 6.10.0 6.9 6.8 Change-Id: I61a64c8637c222290e4c630d75d579f6bb23886c Reviewed-by: Ville Voutilainen <[email protected]>
Diffstat (limited to 'src/quick/doc')
-rw-r--r--src/quick/doc/src/android/qtquick-for-android.qdoc17
-rw-r--r--src/quick/doc/src/qtquick-external-resources.qdoc14
2 files changed, 24 insertions, 7 deletions
diff --git a/src/quick/doc/src/android/qtquick-for-android.qdoc b/src/quick/doc/src/android/qtquick-for-android.qdoc
index be3cc4617e..6e08f65b56 100644
--- a/src/quick/doc/src/android/qtquick-for-android.qdoc
+++ b/src/quick/doc/src/android/qtquick-for-android.qdoc
@@ -62,16 +62,23 @@
\target Android Classes
These are the public Java and Kotlin APIs that you will use in an Android
app to embed QML.
- //! TODO: Update links to Java API docs when published
+
+ \section2 Java classes
+
\list
\li \l{QtQuickView}
\li \l{QtQuickViewContent}
- \li \l{QtAbstractItemModel Android Class}
- \li \l{QtAbstractListModel Android Class}
- \li \l{interface QtQmlStatusChangeListener} (which uses the QtQmlStatus enum)
- \li \l{QtModelIndex Android Class}
+ \li \l{QtAbstractItemModel}
+ \li \l{QtAbstractListModel}
+ \li \l{QtModelIndex}
\endlist
+ \section2 Interfaces
+
+ \list
+ \li \l{QtQmlStatusChangeListener} (which uses the \l QtQmlStatus enum)
+ \endlist
+
\note See the \l{QT_ANDROID_GENERATE_JAVA_QTQUICKVIEW_CONTENTS} CMake
variable for further information on Java code generation of QML components.
diff --git a/src/quick/doc/src/qtquick-external-resources.qdoc b/src/quick/doc/src/qtquick-external-resources.qdoc
index c5472e9e63..78b969c4eb 100644
--- a/src/quick/doc/src/qtquick-external-resources.qdoc
+++ b/src/quick/doc/src/qtquick-external-resources.qdoc
@@ -7,11 +7,21 @@
*/
/*!
- \externalpage https://code.qt.io/cgit/qt/qtdeclarative.git/tree/src/quick/platform/android/jar/src/org/qtproject/qt/android/QtQuickView.java?h=6.10
+ \externalpage https://doc.qt.io/qt-6/qtquick/android/org/qtproject/qt/android/QtQuickView.html
\title QtQuickView
*/
/*!
- \externalpage https://code.qt.io/cgit/qt/qtdeclarative.git/tree/src/quick/platform/android/jar/src/org/qtproject/qt/android/QtQuickViewContent.java?h=6.10
+ \externalpage https://doc.qt.io/qt-6/qtquick/android/org/qtproject/qt/android/QtQuickViewContent.html
\title QtQuickViewContent
*/
+
+/*!
+ \externalpage https://doc.qt.io/qt-6/qtquick/android/org/qtproject/qt/android/QtQmlStatus.html
+ \title QtQmlStatus
+*/
+
+/*!
+ \externalpage https://doc.qt.io/qt-6/qtquick/android/org/qtproject/qt/android/QtQmlStatusChangeListener.html
+ \title QtQmlStatusChangeListener
+*/