summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-08-16 20:54:03 +0200
committerSergio Ahumada <sergio.ahumada@digia.com>2013-08-16 20:54:03 +0200
commita56c14834b4305335db51c6dc17251026730fa7c (patch)
tree868632325eb113baf50a62558422498069694460
parentf7d81536058af4f79e8a17087bc30fe7c5fcbe74 (diff)
parente79cf774cecdde218795f5061bb3aaae4bc2123e (diff)
Merge remote-tracking branch 'origin/release' into stable
-rw-r--r--src/controls/qquickexclusivegroup.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/controls/qquickexclusivegroup.cpp b/src/controls/qquickexclusivegroup.cpp
index f1b6935ef..a512bc34d 100644
--- a/src/controls/qquickexclusivegroup.cpp
+++ b/src/controls/qquickexclusivegroup.cpp
@@ -131,9 +131,9 @@ static bool isChecked(const QObject *o)
\section1 Adding support to ExclusiveGroup
- It is possible to add support for ExclusiveGroup for an object, or control. It should have a \c checked
+ It is possible to add support for ExclusiveGroup for an object or control. It should have a \c checked
property, and either a \c checkedChanged, \c toggled(), or \c toggled(bool) signal. It also needs
- to be bound with \l ExclusiveGroup::bindCheckable() when its ExclusiveGroup ty[ped property is set.
+ to be bound with \l ExclusiveGroup::bindCheckable() when its ExclusiveGroup typed property is set.
\code
Item {
@@ -149,7 +149,7 @@ static bool isChecked(const QObject *o)
}
\endcode
- The example above shows the minimum necessary to add ExclusiveGroup support to any item.
+ The example above shows the minimum code necessary to add ExclusiveGroup support to any item.
*/
/*!