diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-05-29 13:06:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-30 09:21:16 +0200 |
| commit | 26dda49ccb3572bedc785c85c41cec5db8114579 (patch) | |
| tree | 867b1bcdfa9967df2865ab04b84d8847b13b9aea /src/controls | |
| parent | b0510b53256cbc3d2ea46dd936e85c0d1f463b37 (diff) | |
Rename PaddedStyle to AbstractStyle
Make Style inherit AbstractStyle, so it becomes the base class
of all styles. AbstractStyle also now has a default "data"
property so it's possible to conveniently declare helper
content inside styles.
Change-Id: Id84f3762cfae506e65021322619d7fb77b137994
Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/controls')
| -rw-r--r-- | src/controls/ScrollView.qml | 2 | ||||
| -rw-r--r-- | src/controls/doc/qtquickcontrols.qdocconf | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml index efa6e631b..0af69a0de 100644 --- a/src/controls/ScrollView.qml +++ b/src/controls/ScrollView.qml @@ -147,7 +147,7 @@ FocusScope { property Component style: Qt.createComponent(Settings.style + "/ScrollViewStyle.qml", root) /*! \internal */ - property PaddedStyle __style: styleLoader.item + property Style __style: styleLoader.item activeFocusOnTab: true diff --git a/src/controls/doc/qtquickcontrols.qdocconf b/src/controls/doc/qtquickcontrols.qdocconf index c04bced2c..1f6925976 100644 --- a/src/controls/doc/qtquickcontrols.qdocconf +++ b/src/controls/doc/qtquickcontrols.qdocconf @@ -52,7 +52,7 @@ sources += ../../private/qstyleitem.cpp \ ../../private/TabBar.qml \ ../../private/Control.qml \ ../../private/Style.qml \ - ../../private/qquickpaddedstyle.h \ - ../../private/qquickpaddedstyle.cpp + ../../private/qquickabstractstyle.h \ + ../../private/qquickabstractstyle.cpp imagedirs += images |