Commit Graph

16 Commits

Author SHA1 Message Date
Konsta Alajärvi e13c89d293 Documentation follow up for strong typing changes in Kotlin example
Extend existing documentation of qml_in_android_studio_projects
to explain the adding and using of another QtQmlComponent in
qml_in_kotlin_based_android_project.

Task-number: QTBUG-126050
Pick-to: 6.8
Change-Id: Ib1444ed883c87bcf5c8e3fe9f423dbfef5c8fa66
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2024-06-28 12:43:00 +03:00
Konsta Alajärvi 31443dec1b Documentation follow up for strong typing changes in Java example
Extend existing documentation of qml_in_android_studio_projects
to explain the adding and using of another QtQmlComponent in
qml_in_java_based_android_project.

Task-number: QTBUG-126050
Pick-to: 6.8
Change-Id: Id5b0708c73c52efbe0c3cae46d2869014fb0bae5
Reviewed-by: Alexei Cazacov <alexei.cazacov@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
2024-06-27 07:39:46 +03:00
Konsta Alajärvi 1d61d52098 Add another QML Component into qml_in_kotlin_based_android_project
Add implementation for second qml component in
qml_in_kotlin_based_android_project

Task-number: QTBUG-125099
Pick-to: 6.8
Change-Id: Id0b6c693aac2d67cceda74e623fcd18c9568b84a
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2024-06-24 13:09:33 +03:00
Konsta Alajärvi c62efe4d7f Add another Qml component to Java example
Adds another Qml component into the qml_in_android_view example
that can be used in qml_in_java_based_android_project.

Functionality to load another Qml component in
qml_in_java_based_android_project.

Task-number: QTBUG-125098
Pick-to: 6.8
Change-Id: If85e977ef0057ab9bca93e7b2136d37b01a5c7de
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2024-06-24 08:06:18 +03:00
Konsta Alajärvi fae951b94e Strong typing changes to Qml Embedding Kotlin example documentation
Change Qml Embedding examples docs to reflect the new strong typing
changes in the qml_in_kotlin_based_android_project.

Task-number: QTBUG-126050
Pick-to: 6.8
Change-Id: Ic8a6c8acefa32efed93faca90dd776b62c5b8a05
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
2024-06-18 07:45:45 +00:00
Konsta Alajärvi 6dd80d7894 Strong typing changes to Qml Embedding Java example documentation
Change Qml Embedding examples docs to reflect the new strong typing
changes in the qml_in_java_based_android_project.

Task-number: QTBUG-126050
Pick-to: 6.8
Change-Id: I855a0f5043d956b644602dc9feba0d568d464b14
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
2024-06-17 05:20:59 +00:00
Konsta Alajärvi 227d798d98 Use QtQuickView with strong typing in qml_in_kotlin_based_android_project
Changes the way QtQuickView is used in MainActivity.kt

Task-number: QTBUG-125099
Pick-to: 6.8
Change-Id: I9308fc08cd7ddbec8955baccf95fa0c05117e305
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-06-16 13:59:07 +03:00
Konsta Alajärvi 9eb9b6e41e Bumb Android minimum SDK version in qml_embedding Kotlin example
Bump Android minmum SDK version in qml_in_kotlin_based_android_project
gradle config from 26 -> 28.

Qml embedding Kotlin example has a minimum Android SDK set to 26
in the project gradle config. Qt androiddeployqt has a minimum
supported Android SDK set to 28 for Qt 6.8.

This creates a dependency issue with the included .aar lib built with
Qt.

Fixes: QTBUG-125961
Pick-to: 6.8
Change-Id: I2bc54d1303ee41e2697a296f973e0bab01f1356c
Reviewed-by: Olli Vuolteenaho <olli.vuolteenaho@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-06-13 12:58:37 +03:00
Konsta Alajärvi e0b1f70e27 Refactor Java example xml widget ids to be more descriptive
Refactor Java example xml widget ids, because some of them were a bit ambiguous.

Pick-to: 6.8
Change-Id: I49f6e1bb14d42859164bf12cb386b779dcaaee15
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-06-04 22:27:48 +03:00
Konsta Alajärvi d2ffd5b59e Bump Android minimum SDK version in qml_embedding Java example
Bump Android minmum SDK version in qml_in_java_base_androi_project
gradle config from 26 -> 28.

Qml embedding Java example has a minimum Android SDK set to 26
in the project gradle config. Qt androiddeployqt has a minimum
supported Android SDK set to 28 for Qt 6.8.

This creates a dependency issue with the included .aar lib built with
Qt.

Fixes: QTBUG-125961
Pick-to: 6.8
Change-Id: I3b611669ec52621171e9b88f34286fa1b2492faf
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-06-03 11:51:28 +00:00
Konsta Alajärvi f16e05ade6 Use QtQuickView with strong typing in qml_in_java_based_android_project
Changes in the way QtQuickView is used in MainActivity.java

Task-number: QTBUG-125098
Change-Id: I4b60bde84df17b8d765bf6a974e4b13cb38f5bc2
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
2024-06-02 08:39:30 +03:00
Konsta Alajärvi 8ff9a21709 Rename qml_in_android_view example main.qml and URI
Rename qml_in_android_view example main.qml to Main.qml because
qml files starting with lower case letters are considered to be only
files not components.

Rename qml_in_android_view example URI because if the URI and module name are same there is a class name clash with the Qml Component Java code generation.

Covers: QTBUG-125159

Task-number: QTBUG-125098
Change-Id: I40394d890ed680f17fe49d650bc42c2a3d3348e4
Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
2024-06-02 08:39:27 +03:00
Konsta Alajärvi 947986009d 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>
2024-05-03 17:03:14 +03:00
Konsta Alajärvi e8060eac72 Add example showcasing embedding QML to native Android Kotlin project
Add new project folder qml_in_kotlin_based_android_project which
include the new Android Studio project.

Fixes: QTBUG-120717
Pick-to: 6.7
Change-Id: I53023c897c92d275018b4e40ab84a3b60e0afa1f
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-05-02 13:17:15 +03:00
Nicholas Bennett 0b594fb3ba Adds documentation for the qml_in_java_based_android_projects example
Added a qdoc file to the top folder and edited the qtquick.qdocconf
file to include it as src and for snippets.

Task-number: QTBUG-122964
Pick-to: 6.7
Change-Id: I581e369b0682804729a98288164492ac1c604194
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-04-17 02:00:15 +03:00
Konsta Alajärvi 1fd9c628f5 Add example showcasing Embedding QML to native Android Java project
Add new example showcasing how to embed QML into native Android
Java application.

New folder platforms/android, which include the new
Android Java project and Qt project in their own project folders.

Pick-to: 6.7
Fixes: QTBUG-120716
Change-Id: Ibab8b7653eb7d4199b93630d03f3543d0d734c4a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-04-10 13:24:53 +03:00