diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-11-20 12:19:09 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-11-20 12:19:09 (GMT) |
| commit | b5294497836db44261c97cfeab28d0ac4f8402f1 (patch) | |
| tree | c4331314445b41166ce2cd22a80c9fb9f46b5023 /demos/browser/downloadmanager.cpp | |
| parent | 2473ab1cf217a989849190cbfa47fe312698adb9 (diff) | |
| parent | 1b8d5bec5763708c66e7bd586aee3df7f94b5cb5 (diff) | |
| download | Qt-b5294497836db44261c97cfeab28d0ac4f8402f1.zip Qt-b5294497836db44261c97cfeab28d0ac4f8402f1.tar.gz Qt-b5294497836db44261c97cfeab28d0ac4f8402f1.tar.bz2 | |
Merge branch '4.6' into mmfphonon
Conflicts:
demos/qmediaplayer/mediaplayer.cpp
Diffstat (limited to 'demos/browser/downloadmanager.cpp')
| -rw-r--r-- | demos/browser/downloadmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/browser/downloadmanager.cpp b/demos/browser/downloadmanager.cpp index 9986439..f57fea1 100644 --- a/demos/browser/downloadmanager.cpp +++ b/demos/browser/downloadmanager.cpp @@ -94,8 +94,8 @@ void DownloadItem::init() connect(m_reply, SIGNAL(readyRead()), this, SLOT(downloadReadyRead())); connect(m_reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(error(QNetworkReply::NetworkError))); - connect(m_reply, SIGNAL(downloadProgress(qint64, qint64)), - this, SLOT(downloadProgress(qint64, qint64))); + connect(m_reply, SIGNAL(downloadProgress(qint64,qint64)), + this, SLOT(downloadProgress(qint64,qint64))); connect(m_reply, SIGNAL(metaDataChanged()), this, SLOT(metaDataChanged())); connect(m_reply, SIGNAL(finished()), |