diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-07 17:20:24 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-07 17:24:19 +0200 |
| commit | a3b706531b98c64137acaebf26756828cd43a2a0 (patch) | |
| tree | b04490213d60519b8a0c90f9c166eef862ed185b /src/quicktemplates2/qquickprogressbar.cpp | |
| parent | 2f4a059881dbec289d86abc7456b42d5eec77ceb (diff) | |
| parent | c2b7e55af43518ae1898eddf8611ef617149ca8a (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-disabled.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-normal.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-checked.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-disabled.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-focused.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-normal.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-disabled.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-first-handle-focused.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-normal.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle-focused.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-disabled.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-focused.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-normal.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar-explicit.qml
src/quicktemplates2/qquickmenu.cpp
tests/auto/controls/data/tst_buttongroup.qml
tests/auto/controls/data/tst_swipedelegate.qml
Change-Id: Ib6042a0ad716f557927e7412d17ea8957d06c015
Diffstat (limited to 'src/quicktemplates2/qquickprogressbar.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickprogressbar.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/quicktemplates2/qquickprogressbar.cpp b/src/quicktemplates2/qquickprogressbar.cpp index 9c091ba1..00ecc5c5 100644 --- a/src/quicktemplates2/qquickprogressbar.cpp +++ b/src/quicktemplates2/qquickprogressbar.cpp @@ -48,16 +48,11 @@ QT_BEGIN_NAMESPACE \ingroup qtquickcontrols2-indicators \brief Indicates the progress of an operation. + \image qtquickcontrols2-progressbar.gif + ProgressBar indicates the progress of an operation. The value should be updated regularly. The range is defined by \l from and \l to, which both can contain any value. - \table - \row \li \image qtquickcontrols2-progressbar-normal.png - \li A progress bar in its normal state. - \row \li \image qtquickcontrols2-progressbar-disabled.png - \li A progress bar that is disabled. - \endtable - \code ProgressBar { value: 0.5 @@ -214,8 +209,7 @@ qreal QQuickProgressBar::visualPosition() const A progress bar in indeterminate mode displays that an operation is in progress, but it doesn't show how much progress has been made. - See below for an example: - \image qtquickcontrols2-progressbar-indeterminate.png + \image qtquickcontrols2-progressbar-indeterminate.gif */ bool QQuickProgressBar::isIndeterminate() const |