diff options
| author | Konsta Alajärvi <konsta.alajarvi@qt.io> | 2024-04-22 10:21:21 +0300 |
|---|---|---|
| committer | Konsta Alajärvi <konsta.alajarvi@qt.io> | 2024-05-03 17:03:14 +0300 |
| commit | 947986009dd13ff2992c1f91b369493037fb1463 (patch) | |
| tree | 92b0d869e03d9fc4689aea167f5bfe563180cff7 /src/quick | |
| parent | 68b2bab607d6c913447b1f6c6790ad657a6ab618 (diff) | |
Adds documentation for the qml_in_kotlin_based_android_projects example
Documented the qml_in_kotlin_based_android_projects example in the
same .qdoc file as the qml_in_java_based_projects example.
Added snippets tags to MainActivity.kt.
Added support for code snippets from .kt files in qtquick.qdocconf.
Fixes: QTBUG-123423
Pick-to: 6.7
Change-Id: I5ac4d231bf77a23b4083ca26712949d66c2483c1
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/doc/qtquick.qdocconf | 3 | ||||
| -rw-r--r-- | src/quick/jar/org/qtproject/qt/android/QtQuickView.qdoc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index 913d4408c2..deda199b96 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -97,7 +97,8 @@ imagedirs += images excludefiles += ../util/qquickpropertychanges_p.h examples.fileextensions += "*.qm" \ - "*.java" + "*.java" \ + "*.kt" manifestmeta.thumbnail.names += "QtQuick/QML Dynamic View Ordering Tutorial*" diff --git a/src/quick/jar/org/qtproject/qt/android/QtQuickView.qdoc b/src/quick/jar/org/qtproject/qt/android/QtQuickView.qdoc index 11c94fe8d6..26d08e41c4 100644 --- a/src/quick/jar/org/qtproject/qt/android/QtQuickView.qdoc +++ b/src/quick/jar/org/qtproject/qt/android/QtQuickView.qdoc @@ -60,7 +60,7 @@ } \endcode - For a more detailed example, see \l {QML in Java-Based Android Projects}. + For a more detailed example, see \l {QML in Android Studio Projects}. \section1 Constructors |