diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2013-05-23 17:57:37 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-24 18:04:44 +0200 |
| commit | a0857d28e01e3a5769ac8f106d088fde648161e8 (patch) | |
| tree | 43a618a92f4813f3d163db02253cb89e0b56f901 /src/controls/ScrollView.qml | |
| parent | 7adbdc017982aec8645e152c7891ea51f84ff8ee (diff) | |
| download | qtquickcontrols-a0857d28e01e3a5769ac8f106d088fde648161e8.tar.gz | |
Enable padding as a grouped property
We want padding to be a grouped property as the
existing Margins property looks rather odd and
insconsistent.
Change-Id: I9e614f9161aaf01af200b19a1fb46a51beec6fb4
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/controls/ScrollView.qml')
| -rw-r--r-- | src/controls/ScrollView.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml index bbd21b24..31f69b8f 100644 --- a/src/controls/ScrollView.qml +++ b/src/controls/ScrollView.qml @@ -81,7 +81,7 @@ import QtQuick.Controls.Styles 1.0 \l flickableItem. You can create a custom appearance for a ScrollView by - assigning a ScrollViewStyle. + assigning a \l ScrollViewStyle. */ FocusScope { @@ -147,7 +147,7 @@ FocusScope { property Component style: Qt.createComponent(Settings.style + "/ScrollViewStyle.qml", root) /* \internal */ - property Style __style: styleLoader.item + property PaddedStyle __style: styleLoader.item activeFocusOnTab: true |