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/Frame.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/imports/controls/Frame.qml') diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml index 8c73f6ba..dc773e95 100644 --- a/src/imports/controls/Frame.qml +++ b/src/imports/controls/Frame.qml @@ -50,7 +50,7 @@ AbstractFrame { contentWidth: content.children.length === 1 ? content.children[0].implicitWidth : 0 contentHeight: content.children.length === 1 ? content.children[0].implicitHeight : 0 - padding: Style.padding + padding: Theme.padding contentItem: Item { id: content @@ -62,7 +62,7 @@ AbstractFrame { background: Rectangle { color: "transparent" - radius: control.Style.roundness - border.color: control.Style.frameColor + radius: control.Theme.roundness + border.color: control.Theme.frameColor } } -- cgit v1.2.3