summaryrefslogtreecommitdiffstats
path: root/src/controls/Styles/Android/TableViewStyle.qml
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-08-28 16:17:05 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-08-28 16:17:05 +0200
commit1c9bf2e4641ba1fe8e6d8ba3da0d783e11ae56f6 (patch)
tree7acb42c1c65868a3befa256cf117b6cacb942546 /src/controls/Styles/Android/TableViewStyle.qml
parent10f0da6cfb56396a16ec741380556320fba86552 (diff)
parent042cd5a6d88685d57e8828e4aca55e48feeb9bf7 (diff)
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/controls/Styles/Android/TableViewStyle.qml')
-rw-r--r--src/controls/Styles/Android/TableViewStyle.qml8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/controls/Styles/Android/TableViewStyle.qml b/src/controls/Styles/Android/TableViewStyle.qml
index dd352af44..2cf6745fd 100644
--- a/src/controls/Styles/Android/TableViewStyle.qml
+++ b/src/controls/Styles/Android/TableViewStyle.qml
@@ -68,7 +68,7 @@ ScrollViewStyle {
DrawableLoader {
id: bg
anchors.fill: parent
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: parent.styleDef.View_background
}
@@ -77,7 +77,7 @@ ScrollViewStyle {
text: styleData.value !== undefined ? styleData.value : ""
horizontalAlignment: styleData.textAlignment
pressed: styleData.pressed
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: parent.styleDef
anchors.fill: parent
anchors.leftMargin: paddingStart
@@ -97,7 +97,7 @@ ScrollViewStyle {
pressed: styleData.pressed
checked: styleData.selected
selected: styleData.selected
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: AndroidStyle.styleDef.simple_selectable_list_item.View_background
}
@@ -128,7 +128,7 @@ ScrollViewStyle {
pressed: styleData.pressed
focused: control.activeFocus
selected: styleData.selected
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: parent.styleDef
anchors.left: parent.left
anchors.right: parent.right