aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/controls/qquickbusyindicator.cpp2
-rw-r--r--src/controls/qquickbutton.cpp2
-rw-r--r--src/controls/qquickexclusivegroup.cpp3
-rw-r--r--src/controls/qquickscrollindicator.cpp4
-rw-r--r--src/controls/qquicktextarea.cpp2
5 files changed, 6 insertions, 7 deletions
diff --git a/src/controls/qquickbusyindicator.cpp b/src/controls/qquickbusyindicator.cpp
index 84ce7a69..ddb55c4b 100644
--- a/src/controls/qquickbusyindicator.cpp
+++ b/src/controls/qquickbusyindicator.cpp
@@ -108,7 +108,7 @@ void QQuickBusyIndicator::setRunning(bool running)
/*!
\qmlproperty Item QtQuickControls2::BusyIndicator::indicator
- This property holds the \l{QQuickItem,item} which graphically implements the busy indicator.
+ This property holds the \l[QML]{Item}, which graphically implements the busy indicator.
*/
QQuickItem *QQuickBusyIndicator::indicator() const
{
diff --git a/src/controls/qquickbutton.cpp b/src/controls/qquickbutton.cpp
index 286b5ccd..2359d4f1 100644
--- a/src/controls/qquickbutton.cpp
+++ b/src/controls/qquickbutton.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
Button presents a push-button control that can be pushed or clicked by
the user. Buttons are normally used to perform an action, or to answer
a question. Typical buttons are \e OK, \e Apply, \e Cancel, \e Close,
- \e Yes, \e No and \e Help.
+ \e Yes, \e No, and \e Help.
\table
\row \li \image qtquickcontrols2-button-normal.png
diff --git a/src/controls/qquickexclusivegroup.cpp b/src/controls/qquickexclusivegroup.cpp
index df1cf8ae..1531b11e 100644
--- a/src/controls/qquickexclusivegroup.cpp
+++ b/src/controls/qquickexclusivegroup.cpp
@@ -51,8 +51,7 @@ QT_BEGIN_NAMESPACE
\brief An exclusive group of checkable controls.
ExclusiveGroup is a non-visual, mutually exclusive group of checkable
- controls and objects. It is used with controls like RadioButton, where
- only one of options can be selected at a time.
+ controls and objects. It is used with controls such as RadioButton, where only one of the options can be selected at a time.
Any control or object that has a \c checked property, and either a
\c checkedChanged(), \c toggled(), or \c toggled(bool) signal, can be
diff --git a/src/controls/qquickscrollindicator.cpp b/src/controls/qquickscrollindicator.cpp
index 3b27045d..a44db0cb 100644
--- a/src/controls/qquickscrollindicator.cpp
+++ b/src/controls/qquickscrollindicator.cpp
@@ -152,8 +152,8 @@ void QQuickScrollIndicator::setPosition(qreal position)
/*!
\qmlproperty bool QtQuickControls2::ScrollIndicator::active
- This property holds whether the indicator is active ie. when the attached
- Flickable is \l {Flickable::moving}{moving}.
+ This property holds whether the indicator is active, that is, when the
+ attached Flickable is \l {Flickable::moving}{moving}.
*/
bool QQuickScrollIndicator::isActive() const
{
diff --git a/src/controls/qquicktextarea.cpp b/src/controls/qquicktextarea.cpp
index c8025069..a670f893 100644
--- a/src/controls/qquicktextarea.cpp
+++ b/src/controls/qquicktextarea.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
\ingroup editors
\brief A multi line text input control.
- TextArea is a multi line text editor. TextArea extends TextEdit
+ TextArea is a multi-line text editor. TextArea extends TextEdit
with a \l placeholder text functionality, and adds decoration.
\code