diff options
author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-09-24 16:53:22 +0200 |
---|---|---|
committer | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-09-25 10:45:33 +0200 |
commit | 24eefa0bbb3fd3acd5277c8e8d0e39f4b3a12a72 (patch) | |
tree | 1d42340a609534277326966b6036f6d5ad60d874 /src/imports/nativestyle/controls/DefaultGroupBox.qml | |
parent | 09cad0df0d2e13d966766c2f276e01e708be1950 (diff) |
NativeStyle: rename 'nativeBackground' to '__nativeBackground'
Since all properties that we add to the QML style files will
bleed into the API of the control, prepend '__' to
nativeBackground to mark it as private.
Change-Id: I0cb474e054c3a3824985cf39b4bb675fb57b0696
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/nativestyle/controls/DefaultGroupBox.qml')
-rw-r--r-- | src/imports/nativestyle/controls/DefaultGroupBox.qml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/nativestyle/controls/DefaultGroupBox.qml b/src/imports/nativestyle/controls/DefaultGroupBox.qml index 37d0254d..07c587cb 100644 --- a/src/imports/nativestyle/controls/DefaultGroupBox.qml +++ b/src/imports/nativestyle/controls/DefaultGroupBox.qml @@ -42,7 +42,7 @@ import QtQuick.NativeStyle as NativeStyle T.GroupBox { id: control - readonly property bool nativeBackground: background instanceof NativeStyle.StyleItem + readonly property bool __nativeBackground: background instanceof NativeStyle.StyleItem implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, contentWidth + leftPadding + rightPadding, @@ -50,11 +50,11 @@ T.GroupBox { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, contentHeight + topPadding + bottomPadding) - font.pixelSize: nativeBackground ? background.styleFont(control).pixelSize : undefined + font.pixelSize: __nativeBackground ? background.styleFont(control).pixelSize : undefined label: Rectangle { color: control.palette.window - property point labelPos : control.nativeBackground + property point labelPos : control.__nativeBackground ? background.labelPos : Qt.point(0,0) x: labelPos.x + background.x @@ -72,10 +72,10 @@ T.GroupBox { } } - leftPadding: nativeBackground ? background.contentPadding.left : 0 - rightPadding: nativeBackground ? background.contentPadding.right : 0 - topPadding: nativeBackground ? background.contentPadding.top : 0 - bottomPadding: nativeBackground ? background.contentPadding.bottom : 0 + leftPadding: __nativeBackground ? background.contentPadding.left : 0 + rightPadding: __nativeBackground ? background.contentPadding.right : 0 + topPadding: __nativeBackground ? background.contentPadding.top : 0 + bottomPadding: __nativeBackground ? background.contentPadding.bottom : 0 background: NativeStyle.GroupBox { control: control |