diff options
author | Nico Vertriest <nico.vertriest@theqtcompany.com> | 2016-03-02 14:57:36 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-17 13:53:59 +0000 |
commit | f337d1a2d836edaf8576a561d3ad901c6c152c2f (patch) | |
tree | 7b2e4b78f53f7c4c551ad2fefcf8088f06962cc0 | |
parent | d86ab5674ac231138791aa2d699a1a8b934735ad (diff) |
Doc: complete documentation Control QML Type
Change-Id: Ie6b8dec8bea2315232beccf2f20cc860610451e8
Task-number: QTBUG-51616
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
-rw-r--r-- | src/imports/controls/doc/images/qtlabscontrols-control.png | bin | 0 -> 9850 bytes | |||
-rw-r--r-- | src/templates/qquickcontrol.cpp | 13 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/imports/controls/doc/images/qtlabscontrols-control.png b/src/imports/controls/doc/images/qtlabscontrols-control.png Binary files differnew file mode 100644 index 00000000..eb5ee349 --- /dev/null +++ b/src/imports/controls/doc/images/qtlabscontrols-control.png diff --git a/src/templates/qquickcontrol.cpp b/src/templates/qquickcontrol.cpp index 08c6d893..d0c4e248 100644 --- a/src/templates/qquickcontrol.cpp +++ b/src/templates/qquickcontrol.cpp @@ -65,8 +65,11 @@ QT_BEGIN_NAMESPACE \inqmlmodule Qt.labs.controls \brief The base type of user interface controls. - Control is the base type of user interface controls. + Control is the base type of user interface controls. It receives input + events from the window system, and paints a representation of itself on + the screen. + \image qtlabscontrols-control.png \labs */ @@ -626,6 +629,14 @@ void QQuickControl::resetSpacing() \qmlproperty Locale Qt.labs.controls::Control::locale This property holds the locale of the control. + It contains locale specific properties for formatting data and numbers. + Unless a special locale has been set, this is either the parent's locale + or the default locale. + + Control propagates explicit locale properties from parent to children. + If you change a specific property on a control's locale, that property + propagates to all of the control's children, overriding any system defaults + for that property. \sa mirrored, {LayoutMirroring}{LayoutMirroring} */ |