diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-18 15:25:30 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-18 15:25:30 +0200 |
| commit | 042cd5a6d88685d57e8828e4aca55e48feeb9bf7 (patch) | |
| tree | 94f20550ec5dd038c608b78c30e225631dbfb874 /src/controls/Styles/Android/TextFieldStyle.qml | |
| parent | 57bf74b0dc132a5e139ff1e4e5ada48c33cc6cc8 (diff) | |
| parent | 0efe37f9304b54912aff52bbe98083702d5b1f22 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ic56596f23496f5918104d1f024bdce93ede7119c
Diffstat (limited to 'src/controls/Styles/Android/TextFieldStyle.qml')
| -rw-r--r-- | src/controls/Styles/Android/TextFieldStyle.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Styles/Android/TextFieldStyle.qml b/src/controls/Styles/Android/TextFieldStyle.qml index f56584430..e7eec32c6 100644 --- a/src/controls/Styles/Android/TextFieldStyle.qml +++ b/src/controls/Styles/Android/TextFieldStyle.qml @@ -66,7 +66,7 @@ Style { id: bg anchors.fill: parent focused: control.activeFocus - window_focused: focused && control.window && control.window.active + window_focused: focused && control.Window.active styleDef: panel.styleDef.View_background } @@ -86,7 +86,7 @@ Style { visible: false text: control.text focused: control.activeFocus - window_focused: focused && control.window && control.window.active + window_focused: focused && control.Window.active styleDef: panel.styleDef } } |