From 7b971c28e6098b629b8e9e3e38a9465a3f1bd459 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 8 Apr 2015 18:16:13 +0200 Subject: Rename Style to Theme Change-Id: I0186cd36f0b42ca015b70a09af27f8a3517d4a60 Reviewed-by: Jari-Pekka Nurmi --- src/imports/controls/TabButton.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/imports/controls/TabButton.qml') diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml index b70bd83c..881b18fe 100644 --- a/src/imports/controls/TabButton.qml +++ b/src/imports/controls/TabButton.qml @@ -50,7 +50,7 @@ AbstractTabButton { Accessible.selected: checked Accessible.role: Accessible.PageTab - padding: Style.padding + padding: Theme.padding label: Text { x: control.leftPadding @@ -61,8 +61,8 @@ AbstractTabButton { text: control.text font.pointSize: 10 elide: Text.ElideRight - color: control.pressed ? control.Style.accentColor : control.Style.textColor - opacity: enabled ? 1.0 : control.Style.disabledOpacity + color: control.pressed ? control.Theme.accentColor : control.Theme.textColor + opacity: enabled ? 1.0 : control.Theme.disabledOpacity horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } @@ -70,6 +70,6 @@ AbstractTabButton { background: Rectangle { height: parent.height - 1 implicitHeight: 26 - color: Style.backgroundColor + color: Theme.backgroundColor } } -- cgit v1.2.3