aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/imports/controls/doc/images/qtlabscontrols-control.pngbin0 -> 9850 bytes
-rw-r--r--src/templates/qquickcontrol.cpp13
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
new file mode 100644
index 00000000..eb5ee349
--- /dev/null
+++ b/src/imports/controls/doc/images/qtlabscontrols-control.png
Binary files differ
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}
*/