aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetri Virkkunen <petri.virkkunen@qt.io>2024-09-04 09:56:50 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2024-09-09 07:16:04 +0000
commitb04e7c66373e11872e0e207afd85fd64ac607e49 (patch)
tree85d527b7b9eb6e13c3c35e29fdf945adc70745be
parent8491d546c034cb6f59bcceecbc8a9b5efd0524db (diff)
Android: Update QML in Android service manual test to use new API
QtQuickViewComponent was renamed to QtQuickViewContent, along with that loadComponent was renamed to loadContent. Fixes: QTBUG-128611 Change-Id: I9ca5d58edf5d1d14ea2d014fd94d01e5e07ca106 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 746b4d1086c27b70d153de80420f20bb9fab8f30) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--tests/manual/platforms/android/qtquickview_java/app/src/main/java/com/example/qtquickview_java/QmlService.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/manual/platforms/android/qtquickview_java/app/src/main/java/com/example/qtquickview_java/QmlService.java b/tests/manual/platforms/android/qtquickview_java/app/src/main/java/com/example/qtquickview_java/QmlService.java
index 59d90eb023..8a3a34e3b7 100644
--- a/tests/manual/platforms/android/qtquickview_java/app/src/main/java/com/example/qtquickview_java/QmlService.java
+++ b/tests/manual/platforms/android/qtquickview_java/app/src/main/java/com/example/qtquickview_java/QmlService.java
@@ -34,7 +34,7 @@ public class QmlService extends Service implements QtQmlStatusChangeListener
private static final String TAG = "QmlService";
private WindowManager m_windowManager;
private QtQuickView m_serviceView;
- private final Main m_serviceViewComponent = new Main();
+ private final Main m_serviceViewContent = new Main();
private View m_mainView;
private TextView m_qmlBackgroundColorTextView;
@@ -57,8 +57,8 @@ public class QmlService extends Service implements QtQmlStatusChangeListener
getScreenSize((size) -> {
// Get the available geometry, and split it between the Android and QML UIs
m_serviceView = addQuickView(new Size(size.getWidth() / 2, size.getHeight()));
- m_serviceViewComponent.setStatusChangeListener(this);
- m_serviceView.loadComponent(m_serviceViewComponent);
+ m_serviceViewContent.setStatusChangeListener(this);
+ m_serviceView.loadContent(m_serviceViewContent);
m_mainView = addMainView(new Size(size.getWidth() / 2, size.getHeight()));
connectToNativeControls(m_mainView);
@@ -163,7 +163,7 @@ public class QmlService extends Service implements QtQmlStatusChangeListener
public void onChangeColorButtonListener(View view)
{
- m_serviceViewComponent.setColorStringFormat(getRandomColorString());
+ m_serviceViewContent.setColorStringFormat(getRandomColorString());
final String qmlColor = m_serviceView.getProperty("colorStringFormat");
m_qmlBackgroundColorTextView.setText(qmlColor);