diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-17 23:00:33 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-17 23:00:33 (GMT) |
| commit | 923693d4919f22eabd5cec8fb6e855514bb64fb7 (patch) | |
| tree | ce5c6ec3f89b9bef3684c748bc4bc39af0d53a9a /src/gui/widgets | |
| parent | ec9a31abf003880a60d1120738a3bee7075b8ca8 (diff) | |
| parent | 09e7218a1c30ca33a5d82280f89f07ba54b96555 (diff) | |
| download | Qt-923693d4919f22eabd5cec8fb6e855514bb64fb7.zip Qt-923693d4919f22eabd5cec8fb6e855514bb64fb7.tar.gz Qt-923693d4919f22eabd5cec8fb6e855514bb64fb7.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qprogressbar.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/qtextbrowser.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/widgets/qprogressbar.cpp b/src/gui/widgets/qprogressbar.cpp index dd92bda..1b0a1a1 100644 --- a/src/gui/widgets/qprogressbar.cpp +++ b/src/gui/widgets/qprogressbar.cpp @@ -462,7 +462,7 @@ QString QProgressBar::text() const return result; } - int progress = (qreal(d->value) - d->minimum) * 100.0 / totalSteps; + int progress = (qreal(d->value) - d->minimum) * qreal(100.0) / totalSteps; result.replace(QLatin1String("%p"), QString::number(progress)); return result; } diff --git a/src/gui/widgets/qtextbrowser.cpp b/src/gui/widgets/qtextbrowser.cpp index cd8fa11..e786c5c 100644 --- a/src/gui/widgets/qtextbrowser.cpp +++ b/src/gui/widgets/qtextbrowser.cpp @@ -619,7 +619,8 @@ void QTextBrowserPrivate::restoreHistoryEntry(const HistoryEntry entry) If you want to load documents stored in the Qt resource system use \c{qrc} as the scheme in the URL to load. For example, for the document resource path \c{:/docs/index.html} use \c{qrc:/docs/index.html} as - the URL with setSource(). + the URL with setSource(). To access local files, use \c{file} as the + scheme in the URL. \sa QTextEdit, QTextDocument */ |