diff options
author | David Boddie <dboddie@trolltech.com> | 2010-09-02 13:43:17 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2010-09-02 13:43:17 (GMT) |
commit | 2bb571fe49d05b06b13aedc4f7fb71cbb1c949be (patch) | |
tree | ac37be379829c9aa5e9853763cb7f7d1a22464b8 /demos/browser | |
parent | 0d54ade501443d8a3b0e756520f6c43e602f1283 (diff) | |
parent | 7aed1cf06ed7b50f060ebce7a5a041c752989307 (diff) | |
download | Qt-2bb571fe49d05b06b13aedc4f7fb71cbb1c949be.zip Qt-2bb571fe49d05b06b13aedc4f7fb71cbb1c949be.tar.gz Qt-2bb571fe49d05b06b13aedc4f7fb71cbb1c949be.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'demos/browser')
-rw-r--r-- | demos/browser/downloadmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/browser/downloadmanager.cpp b/demos/browser/downloadmanager.cpp index 876ec1d..ab68209 100644 --- a/demos/browser/downloadmanager.cpp +++ b/demos/browser/downloadmanager.cpp @@ -282,7 +282,7 @@ void DownloadItem::updateInfoLabel() remaining = tr("- %4 %5 remaining") .arg(timeRemaining) .arg(timeRemainingString); - info = QString(tr("%1 of %2 (%3/sec) %4")) + info = tr("%1 of %2 (%3/sec) %4") .arg(dataString(m_bytesReceived)) .arg(bytesTotal == 0 ? tr("?") : dataString(bytesTotal)) .arg(dataString((int)speed)) |