Commit Graph

25 Commits

Author SHA1 Message Date
Nicholas Bennett 07a6e941a5 Docs: Update Qt Quick for Android Example documentation
-Fixed the path to the example.

-Reduced the example image resolution to improve the layout.

-Explained that the QML is defined in main.qml and second.qml.

-Include XML layout snippets and info.

-Added the imports for the qml types to the snippets and explained them.

-Added a link to the Qt Academy course.

Fixes: QTBUG-138219
Pick-to: 6.10
Change-Id: I9d59bc1b5b63a3d6a8230cdd83b99efd886744d5
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2025-08-21 11:30:39 +00:00
Olli Vuolteenaho 3837355aed QtQ4A: Update Gradle and Kotlin plugin versions in examples
Gradle 8.10 -> 8.14.2
Kotlin Android Gradle plugin 2.1.0 -> 2.2.0

Pick-to: 6.10
Task-number: QTBUG-137782
Change-Id: I62b54d2730b1fc48139057d1a4ef0ce4061aaeb0
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
2025-07-15 11:33:07 +03:00
Jani Heikkinen ef2d29eba0 Bump version to 6.11.0
Change-Id: If24576debc2246a2a8c244a56c4a69e9a2f6b2e6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-06-14 02:36:26 +01:00
Olli Vuolteenaho 61149d1822 Android: Fix linter problems in QtQ4A examples
In 6.9.1 the Q4A compile SDK version was bumped to 35, which includes
a new edge-to-edge feature. For now this was disabled until we can add
official support for the feature.

When building the QtQ4A examples from the command line a linter is run
as part of the build process and this raises a complaint about the
disabling of the edge-to-edge feature, as that is not supported until
API level 35 and the minSDKLevel is still 28.

This should be safe to be ignored which we can do by setting the
linter-specific "tools:targetApi" attribute to the element.

Amends 3d3f2dcb5a.

Task-number: QTBUG-134880
Fixes: QTBUG-136933
Pick-to: 6.9 6.9.1 6.8
Change-Id: Ie86fdc429ffb9f89ebe23999967a329cd630f194
Reviewed-by: Petri Virkkunen <petri.virkkunen@qt.io>
2025-05-19 11:29:54 +03:00
Konsta Alajärvi e1663b1550 Android: QtQuick for Android: Fix example scaling features
-set button and other text sizes back
-add thumb and track back to switch
-Change main relative layout gravity from center_vertical to center_horizontal
to make the topMargin take effect
-add previous topMargins back
-remove layout_margins dimension as there were already dimensions for all the places
it was used in
-change naming of some dimensions
-remove unused dimensions
-Adjust text sizes in qtquickview_kotlin and java, they were little
too small on high dpi devices
-Adjust text sizes, margins and other dimensions in Main and Second.qml files

Fixes: QTBUG-134405
Pick-to: 6.9
Change-Id: I35bc7892abe2435bd63b40bca9a21061ae9f0fa8
Reviewed-by: Petri Virkkunen <petri.virkkunen@qt.io>
2025-04-14 15:24:51 +03:00
Konsta Alajärvi 3d3f2dcb5a Disable edge-to-edge feature in qtquickview examples
After bumping the Android compile and target versions to 35,
disable edge-to-edge feature that arrives with Android 15, because it
will be easier for users to work with this for now.

Later we'll add support for edge-to-edge feature.

Task-number: QTBUG-134880
Pick-to: 6.9 6.8
Change-Id: I8d703c6c6b925a39da9ac8ea6a3d23eaa9b3c3a0
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2025-03-20 10:56:51 +02:00
Rami Potinkara f90812878b Android: update Qt Quick for Android examples to SDK 35
This patch updates qtdeclarative examples to use
SDK 35 as a target and compile version SDK.

Task-number: QTBUG-130285
Task-number: QTBUG-129461
Pick-to: 6.9 6.8
Change-Id: Ie11f8bebff7dfeb4c1a87c07826f9e9ef0f78d4b
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2025-03-20 08:56:43 +00:00
Olli Vuolteenaho 567ece7681 QtQ4A: Fix deprecation warnings in examples
Android Studio will default to using JDK21 from Ladybug onwards. This
causes deprecation warnings about settings the source/target
compatibility to Java 8.

The more modern fix would be to use toolchains, but that would
apparently require adding a toolchain resolver. To keep it simple let's
just update the values to Java 17.

Fixes: QTBUG-132802
Pick-to: 6.8 6.9
Change-Id: Ic278a4ea7da8d598cee963dbfce0f6d6c00f0603
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2025-02-19 12:32:53 +02:00
Konsta Alajärvi 131cb7016b Qt Quick for Android: Remove manual orientation handling from examples
Remove any code related to manual target device orientation handling
from Qt Quick for Android examples. Provide alternative landscape
specific layout for examples.

Remove unused variables and imports.

Move unnecessary global variables to local.

Fix couple variable namings in qtquickview_kotlin MainActivity.kt.

Fixes: QTBUG-133325
Change-Id: I55ae0df59dd8b02b5f6cfadccc94095d4b7d4ac1
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2025-02-19 05:54:17 +00:00
Petri Virkkunen 5d70620321 QQ4A: Fix qtquickview_kotlin compilation errors
Looks like some variable renaming was missed at some point. Renamed
calls to match the actual name of the member variable.

Fixes: QTBUG-133276
Change-Id: Ieb7285ae7b617d8a84b3ad59e83f3140dd70f35f
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Olli Vuolteenaho <olli.vuolteenaho@qt.io>
2025-02-18 21:02:04 +02:00
Olli Vuolteenaho 314c8eb498 Update Gradle versions in QtQ4A examples
These versions are currently all over the board, and the intention is
to have them in line with the Qt for Android requirements (which is
Gradle 8.10 and AGP 8.6). Also update the Kotlin plugins while at it.

Task-number: QTBUG-132815
Pick-to: 6.9 6.8
Change-Id: I72d8cb15d80b8b69301bbc2bbfeebf779ef137df
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2025-01-15 20:14:36 +02:00
Jani Heikkinen 496bf62b15 Bump version to 6.10.0
Change-Id: I08b4527cc13f4fb88a2fc5d5c24163e3315e99c9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-01-03 11:57:39 +01:00
Konsta Alajärvi 90538e9d0a Qt Quick for Android: Implement new onStatusChanged in examples
Change currently used onStatusChanged method to new one which delivers
the QtQuickViewContent with it in qtquickview  examples.
To showcase how to use the new onStatusChanged method and how it's
useful in an application where there is multiple Qt Quick view contents.

Add private variable for current Qt Quick view content and store
the content coming with onStatusChanged in it. To avoid unnecessary
code execution and warnings in other parts of the example.

Task-number: QTBUG-127420
Change-Id: I375d21611c071d0d1b17cef7f51f221b21c74e09
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-12-11 12:12:10 +02:00
Petri Virkkunen 8b6905704e QtQuickView: Modify multi-view examples to have both views visible at once
Since we now support having multiple QtQuickViews loaded at once, it
was decided that we can modify the existing 1-view, content-switching
examples to instead display the available QML views all at once.

This change includes:
- Necessary QML changes to fit the content onto one view, including
text wrapping and anchoring changes
- Android layout changes to add a second layout for the second
QtQuickView
- Source changes to load the second view, rename variables to match the
new functionality, and handle orientation changes.

Task-number: QTBUG-129288
Change-Id: I5c8c5e3de168365ead6fdbe9cfe7ad6285d4b8bf
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-12-10 10:12:24 +02:00
Olli Vuolteenaho 686400f78a Remove useLegacyPackaging from Kotlin examples
The reasons are the same as mentioned in
88660cd34a, but that commit didn't touch
the Kotlin examples, probably because of a mistake(?).

I tried removing the blocks, and deploying the examples worked without
issues.

Task-number: QTBUG-131673
Change-Id: I166b39935c479220935a895778fc618119119552
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-11-29 11:57:54 +02:00
Inkamari Harjula 7715c5f056 Fix String '6.8.0' found in 6.9.0 sources in qtdeclarative
Occurrences fixed.

Task-number: QTBUG-130833
Change-Id: Ideda05852ce9bbfbce3dfa7bdf7c06155c598f46
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2024-11-12 14:55:12 +02:00
Soheil Armin 0007adef5b Android: Replace Qt snapshot maven, with release maven repo
This change replaces the 0.1 SNAPSHOT versions with
1.+ version which means 1.0 and above.

We should also remove Qt maven repository URL so the
plugin can be fetched from mavenCentral.

Task-number: QTBUG-128417
Pick-to: 6.8
Change-Id: Id1006b64f6bf3f0d13d03a4f26b441236aa77cc7
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
2024-09-10 16:18:55 +03:00
Konsta Alajärvi ba7223823f Android: Remove and rephrase comments in examples build.gradle files
Remove optional qtKitDir variable and explanation from examples
build.gradle files, as it is already mentioned in documentation.

Rephrase "Relative for pre-installed (Installer or MaintenanceTool)
installations." comment in examples build.gradle files.

Task-number: QTTA-111
Pick-to: 6.8
Change-Id: Iee2eda91a994ddab061d636c739a480bd7a946f5
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-09-02 08:48:18 +03:00
Konsta Alajärvi 1ed1bdde28 Android: migrate examples build confs to Kotlin KTS
Refactor build.gradle(app and top level) from both qtquickview_kotlin
and abstractlistmodel_kotlin to Kotlin.

Rename build.gradle file extensions

Refactor settings.gradle from both examples to Kotlin.

Rename settings.gradle file extensions

Update build.gradle dependencies in qtquickview_kotlin

Task-number: QTTA-111
Pick-to: 6.8
Change-Id: Ife72ba1e7c88d46506292d5aa7f925f485d51866
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-08-25 10:58:52 +00:00
Soheil Armin 3ae2b98a7f Android: Change member names and related docs to .loadContent rename
As the QtQuickView.loadComponent() became QtQuickView.loadContent()
and the QtQmlComponent renamed to QtQuickViewContent, the member names
in examples and related documentation content and documentation links
need to reflect the change, where required.

This change includes renamings, where they are applicable. There are
some cases that the word "component" is a better match, eg. when the
sentence is referring to signals or properties which are directly
talking about the QML component but not the QtQuickViewContent.

Task-number: QTBUG-127084
Pick-to: 6.8
Change-Id: I33ff259d3dfc97fb6b776dd676c19c3eea0842e4
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-08-25 11:05:00 +03:00
Soheil Armin 2578058747 Android: Reflect renaming of QtQuickView.loadContent() in examples
Task-number: QTBUG-127084
Pick-to: 6.8
Change-Id: I087e80e8a826c4db6a1ef15ec52185d2128140d0
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-08-24 14:46:17 +03:00
Konsta Alajärvi f9dc5415a1 Android: Minor clean for qtquickview_kotlin example
Remove unused android.view.View import from MainActivity.kt.

Synchronize activity_main.xml widget ids with the qtquickview_java
example.

Pick-to: 6.8
Change-Id: I4bcf6c78fac095232b69ca15f2061db884aedd09
Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
2024-08-20 09:49:14 +03:00
Konsta Alajärvi 79e48a49e0 Android: Support multiple display densities in qtquickview_kotlin example
Added support for varying target display densities for
qtquickview_kotlin by adding dedicated activity_main layouts for
low,medium,high,xhigh and xxhigh density displays. Whenever example
is launched on a device the layout with the corresponding display
density will be used.

Added target device display density based drawables
for SwitchCompat xml widget track and thumb properties, just like with
the actity_main layouts. This to be able to scale the SwitchCompat
widget with varying densities.

Added style.xml files for each target device display density,
currently just for SwitchCompat text size.

Task-number: QTBUG-124280
Pick-to: 6.8
Change-Id: I7f76bef5da8d8cd94bb74f564cb3efe44a53fb2e
Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
2024-08-19 09:50:51 +03:00
Rami Potinkara 3384c97e27 Android: QtQuickView example Qt Gradle Plugin changes
Modified
-settings.gradle to use Qt Maven (for now)
-build.gradle to use qtgradleplugin from Qt Maven
-did same for qtquickview_java and qtquickview_kotlin

Task-number: QTBUG-127621
Pick-to: 6.8
Change-Id: Ia3e3b54301c95033139101837460aeb370841afc
Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
2024-08-03 15:14:23 +03:00
Rami Potinkara 177a7f4e18 Android: Rename QtQuickView Java and Kotlin examples
Renamed qml_in_.. starting folders to qtquickview starting ones.
After the change this example follows a similar logic as other
declarative/examples/platform/android examples.
The change also shortened the path to address the Windows path
limitation of 260 characters.
Updated also documentation and manual tests.

Fixes: QTBUG-127067
Pick-to: 6.8
Change-Id: Ie564630e0f924d0b0694bf7c9d47931eab00b422
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
2024-07-29 18:58:08 +03:00