summaryrefslogtreecommitdiffstats
path: root/src/widgets/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/doc/src')
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc20
-rw-r--r--src/widgets/doc/src/widgets-tutorial.qdoc6
2 files changed, 23 insertions, 3 deletions
diff --git a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
index e8c1be4c46..32fe384c75 100644
--- a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -862,6 +862,9 @@
\l{#lineedit-password-character-prop}{lineedit-password-character}
property.
+ The password mask delay can be changed using the
+ \l{#lineedit-password-mask-delay-prop}{lineedit-password-mask-delay}
+
See \l{Qt Style Sheets Examples#Customizing QLineEdit}{Customizing QLineEdit}
for an example.
@@ -2009,6 +2012,23 @@
\snippet code/doc_src_stylesheet.qdoc 61
\row
+ \li \b{\c lineedit-password-mask-delay*} \target lineedit-password-mask-delay-prop
+ \li \l{#Number}{Number}
+ \li The QLineEdit password mask delay in milliseconds before
+ \l{#lineedit-password-character-prop}{lineedit-password-character} is applied to visible character.
+
+ If this property is not specified, it defaults to the
+ value specified by the current style for the
+ \l{QStyle::}{SH_LineEdit_PasswordMaskDelay} style hint.
+
+ \b{This property was added in Qt 5.4.}
+
+ Example:
+
+ \snippet code/doc_src_stylesheet.qdoc 160
+
+
+ \row
\li \b{\c margin} \target margin-prop
\li \l {Box Lengths}
\li The widget's margins. Equivalent to specifying \c
diff --git a/src/widgets/doc/src/widgets-tutorial.qdoc b/src/widgets/doc/src/widgets-tutorial.qdoc
index d4cf063231..0a80a976b9 100644
--- a/src/widgets/doc/src/widgets-tutorial.qdoc
+++ b/src/widgets/doc/src/widgets-tutorial.qdoc
@@ -36,9 +36,9 @@
Widgets are the basic building blocks for graphical user interface
(GUI) applications built with Qt. Each GUI component (e.g.
- buttons, labels, text editor) is a \l{QWidget}{widget} that is
+ buttons, labels, text editors) is a \l{QWidget}{widget} that is
placed somewhere within a user interface window, or is displayed
- as an independent window. Each type of widge is provided by a
+ as an independent window. Each type of widget is provided by a
subclass of QWidget, which is itself a subclass of QObject.
QWidget is not an abstract class. It can be used as a container
@@ -49,7 +49,7 @@
As with \l{QObject}s, \l{QWidget}s can be created with parent
objects to indicate ownership, ensuring that objects are deleted
when they are no longer used. With widgets, these parent-child
- relationships have an additional meaning: Each child widget is
+ relationships have an additional meaning: each child widget is
displayed within the screen area occupied by its parent widget.
This means that when you delete a window widget, all the child
widgets it contains are also deleted.