diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2016-09-22 13:44:52 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2016-09-27 06:18:07 +0000 |
| commit | e1b1191e8df727f546bdbbb7da6b14e897c70e7c (patch) | |
| tree | accfa669b22ae6ed387298524684e67f294eea61 /src/imports/controls/doc/src | |
| parent | 966c0348c7a19a17c5be53f87ef54d4fbab8d8c8 (diff) | |
Popup: fix some of the documentation review findings
Change-Id: I69b60faab1588a45e005ba721c9796680bad6ac1
Task-number: QTBUG-55904
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/doc/src')
| -rw-r--r-- | src/imports/controls/doc/src/includes/qquickpopup-padding.qdocinc | 10 | ||||
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc | 18 |
2 files changed, 28 insertions, 0 deletions
diff --git a/src/imports/controls/doc/src/includes/qquickpopup-padding.qdocinc b/src/imports/controls/doc/src/includes/qquickpopup-padding.qdocinc new file mode 100644 index 00000000..31f5d2db --- /dev/null +++ b/src/imports/controls/doc/src/includes/qquickpopup-padding.qdocinc @@ -0,0 +1,10 @@ +//! [padding] + +The padding properties are used to control the geometry of the +\l {contentItem}{content item}. + +Popup uses the same approach to padding as \l {Control::padding}{Control}. +For a visual explanation of the padding system, see the \l {Control Layout} +section of the documentation. + +//! [padding] diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc index 559c89f0..852a1e03 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc @@ -489,6 +489,24 @@ \snippet qtquickcontrols2-pane-custom.qml file + \section2 Customizing Popup + + Popup consists of a \l {Popup::background}{background} and + \l {Popup::contentItem}{content item}. + + \image qtquickcontrols2-popup-custom.png + + \quotefromfile qtquickcontrols2-popup-custom.qml + \skipto import QtQuick 2.6 + \printuntil import QtQuick.Controls 2.0 + \codeline + \skipto Popup + \printuntil { + \printuntil } + \printuntil } + \printuntil } + + \section2 Customizing ProgressBar ProgressBar consists of two visual items: \l {Control::background}{background} |