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/doc | |
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/doc')
-rw-r--r-- | src/controls/doc/qtquickcontrols.qdocconf | 4 | ||||
-rw-r--r-- | src/controls/doc/src/qtquickcontrols-index.qdoc | 3 | ||||
-rw-r--r-- | src/controls/doc/src/styles.qdoc | 6 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/controls/doc/qtquickcontrols.qdocconf b/src/controls/doc/qtquickcontrols.qdocconf index a098c3d3..c04bced2 100644 --- a/src/controls/doc/qtquickcontrols.qdocconf +++ b/src/controls/doc/qtquickcontrols.qdocconf @@ -51,6 +51,8 @@ sources += ../../private/qstyleitem.cpp \ ../../private/ScrollBar.qml \ ../../private/TabBar.qml \ ../../private/Control.qml \ - ../../private/Style.qml + ../../private/Style.qml \ + ../../private/qquickpaddedstyle.h \ + ../../private/qquickpaddedstyle.cpp imagedirs += images diff --git a/src/controls/doc/src/qtquickcontrols-index.qdoc b/src/controls/doc/src/qtquickcontrols-index.qdoc index e9e4f708..011de527 100644 --- a/src/controls/doc/src/qtquickcontrols-index.qdoc +++ b/src/controls/doc/src/qtquickcontrols-index.qdoc @@ -81,4 +81,7 @@ \list \li \l{Qt Quick Controls Examples} \endlist + + \l {Qt Quick Controls Styles QML Types} + */ diff --git a/src/controls/doc/src/styles.qdoc b/src/controls/doc/src/styles.qdoc index 4bb0ae26..40809414 100644 --- a/src/controls/doc/src/styles.qdoc +++ b/src/controls/doc/src/styles.qdoc @@ -31,7 +31,11 @@ \ingroup qmlmodules \brief Provides QML types for Qt Quick Controls styles. - The \l{Qt Quick Controls} module provides a set of QML types for handling + The \l{Qt Quick Controls} module provides a set of QML types for handling styles. + Some of the controls allow custom styling similar to widget style sheets. + A styling object is usually a collection of properties that control behavior and simple delegates + that can be replaced with custom QML snippets. + */ |