diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-06 22:00:15 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-06 22:00:15 (GMT) |
| commit | 34c5c0dc1cf82fe8725afd9f2beb66e486d76f19 (patch) | |
| tree | 48e5fcd217b57d4599aa98bd90a7e6a733eb6e00 /demos | |
| parent | b49dcab1048a5497c85205702bdcab6b243ced0b (diff) | |
| parent | 9754c200aa325614e05e6b00e3adedbdda1d161a (diff) | |
| download | Qt-34c5c0dc1cf82fe8725afd9f2beb66e486d76f19.zip Qt-34c5c0dc1cf82fe8725afd9f2beb66e486d76f19.tar.gz Qt-34c5c0dc1cf82fe8725afd9f2beb66e486d76f19.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/qmediaplayer/mediaplayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/qmediaplayer/mediaplayer.cpp b/demos/qmediaplayer/mediaplayer.cpp index 3cb0616..97a8e35 100644 --- a/demos/qmediaplayer/mediaplayer.cpp +++ b/demos/qmediaplayer/mediaplayer.cpp @@ -716,7 +716,7 @@ void MediaPlayer::openFile() void MediaPlayer::bufferStatus(int percent) { - if (percent == 0 || percent == 100) + if (percent == 100) progressLabel->setText(QString()); else { QString str = QString::fromLatin1("(%1%)").arg(percent); |