summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Arve Saether <jan-arve.saether@theqtcompany.com>2014-10-28 15:14:39 +0100
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2014-10-28 16:39:53 +0100
commitc8d169fd209a1cf1fad2af8113b24757de344494 (patch)
tree1b3d94771b598e721c7da4528f1a1399c6c0082a
parentad99ecba52bc835c4391809202a6d96bb708b065 (diff)
"function accessiblePressAction()" => "Accessible.onPressAction:"
Change-Id: Ic9f8bdf531845a77e43cf526eb9256b85787da5b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
-rw-r--r--qml/pages/BasicPage.qml2
-rw-r--r--qml/pages/LongTermDayItem.qml4
-rw-r--r--qml/touch/ListViewDelegate.qml4
-rw-r--r--qml/touch/TouchTextField.qml2
4 files changed, 6 insertions, 6 deletions
diff --git a/qml/pages/BasicPage.qml b/qml/pages/BasicPage.qml
index acec5ee..aec1054 100644
--- a/qml/pages/BasicPage.qml
+++ b/qml/pages/BasicPage.qml
@@ -117,7 +117,7 @@ Item {
visible: page.Stack.index > 0
Accessible.role: Accessible.Button
Accessible.name: qsTr("Back")
- function accessiblePressAction () { backPressed() }
+ Accessible.onPressAction: { backPressed() }
}
Rectangle {
opacity: 0
diff --git a/qml/pages/LongTermDayItem.qml b/qml/pages/LongTermDayItem.qml
index 3ea8932..a86103e 100644
--- a/qml/pages/LongTermDayItem.qml
+++ b/qml/pages/LongTermDayItem.qml
@@ -65,7 +65,7 @@ ObjectModel {
Accessible.role: Accessible.Button
Accessible.name: qsTr("%1 %2 - temperature low: %3, high: %4, wind: %5 %6").arg(Utils.getDay(0, dayModel)).arg(Utils.getShortDate(dayModel.date)).arg(lowTemp.text).arg(highTemp.text).arg(windSpeed.text).arg(Utils.expandAbbreviation("m/s"))
Accessible.description: qsTr("press for details")
- function accessiblePressAction () {
+ Accessible.onPressAction: {
ApplicationInfo.currentIndexDay = index
nextPage()
}
@@ -74,7 +74,7 @@ ObjectModel {
id: mouse
anchors.fill: parent
onClicked: {
- parent.accessiblePressAction()
+ parent.Accessible.pressAction()
}
}
Rectangle {
diff --git a/qml/touch/ListViewDelegate.qml b/qml/touch/ListViewDelegate.qml
index 8f4c616..7fbc435 100644
--- a/qml/touch/ListViewDelegate.qml
+++ b/qml/touch/ListViewDelegate.qml
@@ -62,7 +62,7 @@ Rectangle {
onClicked: rect.clicked()
Accessible.role: Accessible.Button
Accessible.name: loader.item.accessibleName
- function accessiblePressAction() {
+ Accessible.onPressAction: {
rect.clicked()
}
}
@@ -152,7 +152,7 @@ Rectangle {
onClicked: if (!isSearchView) rect.deleteCity()
Accessible.name: qsTr("Remove %1").arg(city.text)
Accessible.role: Accessible.Button
- function accessiblePressAction () { if (!isSearchView) rect.deleteCity() }
+ Accessible.onPressAction: { if (!isSearchView) rect.deleteCity() }
Image {
id: imageRemove
anchors.centerIn: parent
diff --git a/qml/touch/TouchTextField.qml b/qml/touch/TouchTextField.qml
index b3d794b..9ecdce8 100644
--- a/qml/touch/TouchTextField.qml
+++ b/qml/touch/TouchTextField.qml
@@ -103,7 +103,7 @@ TextField {
width: parent.height
Accessible.role: Accessible.Button
Accessible.name: qsTr("Clear")
- function accessiblePressAction() {
+ Accessible.onPressAction: {
textfield.clearButtonClicked()
}