summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernd Weimer <bernd.weimer@qt.io>2022-03-22 16:50:08 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-03-22 23:22:28 +0000
commit9815214953b9b787dc847bef626dba71c85fb8fa (patch)
tree9b419b518d8d2f872fdf1b0a370da636627c890c
parent98ff299bc9482cb8d67b6d5e9e13c0c8d7103311 (diff)
downloadqtapplicationmanager-9815214953b9b787dc847bef626dba71c85fb8fa.tar.gz
Migrate examples from 6.2 to 6.3
Change-Id: I82424fe66172851f3652ca6acbb4f4d6694a71c2 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit c6448d7661eb165fa9284d67161faf4918f7bc60) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/applicationmanager/animated-windows/system-ui/main.qml2
-rw-r--r--examples/applicationmanager/application-features/system-ui/main.qml5
-rw-r--r--examples/applicationmanager/frame-timer/system-ui/main.qml2
-rw-r--r--examples/applicationmanager/minidesk/system-ui/main.qml2
-rw-r--r--examples/applicationmanager/multi-views/system-ui/main.qml2
5 files changed, 7 insertions, 6 deletions
diff --git a/examples/applicationmanager/animated-windows/system-ui/main.qml b/examples/applicationmanager/animated-windows/system-ui/main.qml
index 9b4aa6e8..f1807d98 100644
--- a/examples/applicationmanager/animated-windows/system-ui/main.qml
+++ b/examples/applicationmanager/animated-windows/system-ui/main.qml
@@ -114,7 +114,7 @@ Rectangle {
// Title bar text
Text {
anchors.horizontalCenter: parent.horizontalCenter
- text: model.window.application.name("en") + " application window"
+ text: model.window.application.names["en"] + " application window"
}
// Raises the window when the title bar is clicked and moves it around when dragged.
diff --git a/examples/applicationmanager/application-features/system-ui/main.qml b/examples/applicationmanager/application-features/system-ui/main.qml
index 445e77dc..d8742dd7 100644
--- a/examples/applicationmanager/application-features/system-ui/main.qml
+++ b/examples/applicationmanager/application-features/system-ui/main.qml
@@ -81,7 +81,7 @@ Window {
Text {
id: appid
- text: application.name("en")
+ text: application.names["en"]
}
}
@@ -129,7 +129,8 @@ Window {
Text {
anchors.horizontalCenter: parent.horizontalCenter
- text: model.window.application ? model.window.application.name("en") : 'External Application'
+ text: model.window.application ? model.window.application.names["en"]
+ : 'External Application'
}
MouseArea {
diff --git a/examples/applicationmanager/frame-timer/system-ui/main.qml b/examples/applicationmanager/frame-timer/system-ui/main.qml
index 4c13a351..6a3e66e4 100644
--- a/examples/applicationmanager/frame-timer/system-ui/main.qml
+++ b/examples/applicationmanager/frame-timer/system-ui/main.qml
@@ -198,7 +198,7 @@ Window {
// Title bar text
Text {
anchors.horizontalCenter: parent.horizontalCenter
- text: model.window.application.name("en") + " application window"
+ text: model.window.application.names["en"] + " application window"
}
// Raises the window when the title bar is clicked and moves it around when dragged.
diff --git a/examples/applicationmanager/minidesk/system-ui/main.qml b/examples/applicationmanager/minidesk/system-ui/main.qml
index 7eb3f560..da4d44c6 100644
--- a/examples/applicationmanager/minidesk/system-ui/main.qml
+++ b/examples/applicationmanager/minidesk/system-ui/main.qml
@@ -94,7 +94,7 @@ Window {
Text {
anchors.horizontalCenter: parent.horizontalCenter
- text: "Decoration: " + (model.window.application ? model.window.application.name("en")
+ text: "Decoration: " + (model.window.application ? model.window.application.names["en"]
: 'External Application')
}
diff --git a/examples/applicationmanager/multi-views/system-ui/main.qml b/examples/applicationmanager/multi-views/system-ui/main.qml
index 919dbaff..2269b962 100644
--- a/examples/applicationmanager/multi-views/system-ui/main.qml
+++ b/examples/applicationmanager/multi-views/system-ui/main.qml
@@ -111,7 +111,7 @@ Rectangle {
Text {
anchors.horizontalCenter: parent.horizontalCenter
- text: (windowItem.primary ? "Primary: " : "Secondary: ") + model.window.application.name("en")
+ text: (windowItem.primary ? "Primary: " : "Secondary: ") + model.window.application.names["en"]
}
MouseArea {