aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2016-10-13 11:55:07 +0200
committerMitch Curtis <mitch.curtis@qt.io>2016-10-13 13:34:59 +0000
commit416ce4ee480fb42764065af76826b7910faf42c1 (patch)
treef416022841d3619742c55ef07afa5a72832deeb3 /src
parent2967cb68e8c4354ea2bccfad363b0a6d980233e7 (diff)
ProgressBar: add section to Indicator Controls page and link to it
Change-Id: Ib6744c59f775aba3bc5132ad4ce721c71c3932dd Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc7
-rw-r--r--src/quicktemplates2/qquickprogressbar.cpp2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc
index 03750844..84367278 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc
@@ -52,6 +52,13 @@
\l BusyIndicator can be used to show that an operation is in progress,
and that the UI has to wait for the operation to complete.
+ \section1 ProgressBar Control
+
+ \image qtquickcontrols2-progressbar.gif
+
+ \l ProgressBar indicates the progress of an operation. The value should be
+ updated regularly.
+
\section1 ScrollBar Control
\image qtquickcontrols2-scrollbar.gif
diff --git a/src/quicktemplates2/qquickprogressbar.cpp b/src/quicktemplates2/qquickprogressbar.cpp
index 00ecc5c5..7bf30318 100644
--- a/src/quicktemplates2/qquickprogressbar.cpp
+++ b/src/quicktemplates2/qquickprogressbar.cpp
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
}
\endcode
- \sa {Customizing ProgressBar}, BusyIndicator
+ \sa {Customizing ProgressBar}, BusyIndicator, {Indicator Controls}
*/
class QQuickProgressBarPrivate : public QQuickControlPrivate