Changeset 846 for trunk/demos/browser/downloadmanager.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• demos/browser/downloadmanager.cpp (modified) (2 diffs)

trunk/demos/browser/downloadmanager.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -283 +283 @@
             .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))