diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:05:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 14:02:43 +0200 |
| commit | 7cbee5629604aa49c618829c8e3e55fc64e94df7 (patch) | |
| tree | d12041105160c1cb21226b365edb9653d87b5853 /src/widgets/widgets/qprogressbar.cpp | |
| parent | e400b7e326c554ccd819448866265953d2a0f24d (diff) | |
| parent | 5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmenu.cpp
Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308
Diffstat (limited to 'src/widgets/widgets/qprogressbar.cpp')
| -rw-r--r-- | src/widgets/widgets/qprogressbar.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/widgets/widgets/qprogressbar.cpp b/src/widgets/widgets/qprogressbar.cpp index 39faf2e458..e26673a010 100644 --- a/src/widgets/widgets/qprogressbar.cpp +++ b/src/widgets/widgets/qprogressbar.cpp @@ -177,6 +177,8 @@ bool QProgressBarPrivate::repaintRequired() const \ingroup basicwidgets \inmodule QtWidgets + \image windows-progressbar.png + A progress bar is used to give the user an indication of the progress of an operation and to reassure them that the application is still running. @@ -198,15 +200,6 @@ bool QProgressBarPrivate::repaintRequired() const example, when using QNetworkAccessManager to download items when they are unable to determine the size of the item being downloaded. - \table - \row \li \inlineimage macintosh-progressbar.png Screenshot of a Macintosh style progress bar - \li A progress bar shown in the Macintosh widget style. - \row \li \inlineimage windowsvista-progressbar.png Screenshot of a Windows Vista style progress bar - \li A progress bar shown in the Windows Vista widget style. - \row \li \inlineimage fusion-progressbar.png Screenshot of a Fusion style progress bar - \li A progress bar shown in the Fusion widget style. - \endtable - \sa QProgressDialog, {fowler}{GUI Design Handbook: Progress Indicator} */ |