diff options
| author | Olli Vuolteenaho <olli.vuolteenaho@qt.io> | 2025-05-16 07:35:51 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2025-05-20 04:16:50 +0000 |
| commit | a8a77a03d589010c6424c0c08aa6e01936b80652 (patch) | |
| tree | 4b06e5f897149a422d85b15c831366d9703fcbe5 | |
| parent | 550a003b70f364747cbde6cb29774b90bb32ce35 (diff) | |
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 3d3f2dcb5ad3a0d57ae39383a9998196948c3d08.
Task-number: QTBUG-134880
Fixes: QTBUG-136933
Change-Id: Ie86fdc429ffb9f89ebe23999967a329cd630f194
Reviewed-by: Petri Virkkunen <petri.virkkunen@qt.io>
(cherry picked from commit 61149d18225fdcbadc92aa84778436b86e1b9feb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 2572db088ba6301f6b0bd27bde09582d9557b859)
5 files changed, 5 insertions, 5 deletions
diff --git a/examples/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/values-night/themes.xml b/examples/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/values-night/themes.xml index a870d23a5d..35f2dd5426 100644 --- a/examples/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/values-night/themes.xml +++ b/examples/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/values-night/themes.xml @@ -1,7 +1,7 @@ <resources xmlns:tools="http://schemas.android.com/tools"> <!-- Base application theme. --> <style name="Theme.qtabstractitemmodel_java" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> - <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item> + <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item> <!-- Primary brand color. --> <item name="colorPrimary">@color/purple_200</item> <item name="colorPrimaryVariant">@color/purple_700</item> diff --git a/examples/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/values/themes.xml b/examples/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/values/themes.xml index b7639cd776..205e4d3da3 100644 --- a/examples/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/values/themes.xml +++ b/examples/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/values/themes.xml @@ -1,7 +1,7 @@ <resources xmlns:tools="http://schemas.android.com/tools"> <!-- Base application theme. --> <style name="Theme.qtabstractitemmodel_java" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> - <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item> + <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item> <!-- Primary brand color. --> <item name="colorPrimary">@color/purple_500</item> <item name="colorPrimaryVariant">@color/purple_700</item> diff --git a/examples/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/values/themes.xml b/examples/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/values/themes.xml index ba66b85808..dd33ea4547 100644 --- a/examples/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/values/themes.xml +++ b/examples/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/values/themes.xml @@ -1,7 +1,7 @@ <resources xmlns:tools="http://schemas.android.com/tools"> <!-- Base application theme. --> <style name="Theme.qtabstractlistmodel_kotlin" parent="Theme.MaterialComponents.DayNight.NoActionBar"> - <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item> + <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item> <!-- Primary brand color. --> <item name="colorPrimary">@color/pine</item> <item name="colorPrimaryVariant">@color/purple_700</item> diff --git a/examples/platforms/android/qtquickview_java/app/src/main/res/values/themes.xml b/examples/platforms/android/qtquickview_java/app/src/main/res/values/themes.xml index e894a5ec34..316b81846d 100644 --- a/examples/platforms/android/qtquickview_java/app/src/main/res/values/themes.xml +++ b/examples/platforms/android/qtquickview_java/app/src/main/res/values/themes.xml @@ -1,7 +1,7 @@ <resources xmlns:tools="http://schemas.android.com/tools"> <!-- Base application theme. --> <style name="Theme.MyApplication" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> - <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item> + <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item> <!-- Primary brand color. --> <item name="colorPrimary">@color/purple_500</item> <item name="colorPrimaryVariant">@color/purple_700</item> diff --git a/examples/platforms/android/qtquickview_kotlin/app/src/main/res/values/themes.xml b/examples/platforms/android/qtquickview_kotlin/app/src/main/res/values/themes.xml index d3427bd949..f93b97b5fa 100644 --- a/examples/platforms/android/qtquickview_kotlin/app/src/main/res/values/themes.xml +++ b/examples/platforms/android/qtquickview_kotlin/app/src/main/res/values/themes.xml @@ -1,7 +1,7 @@ <resources xmlns:tools="http://schemas.android.com/tools"> <!-- Base application theme. --> <style name="Theme.qtquickview_kotlin" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> - <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item> + <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item> <!-- Primary brand color. --> <item name="colorPrimary">@color/purple_500</item> <item name="colorPrimaryVariant">@color/purple_700</item> |
