diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-19 12:08:44 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-19 12:08:44 (GMT) |
| commit | acb5cd795f4ea75794cfd31eaf768ec5a3e62844 (patch) | |
| tree | 28064e139d82b1f51c43b67c078855524b52821c /src/network/access/qhttp.cpp | |
| parent | 65e00180516eb136c2a7119dfe9e63fc9c66065e (diff) | |
| parent | 8e401cd4ae0133531613a3e097acc57979d78f50 (diff) | |
| download | Qt-acb5cd795f4ea75794cfd31eaf768ec5a3e62844.zip Qt-acb5cd795f4ea75794cfd31eaf768ec5a3e62844.tar.gz Qt-acb5cd795f4ea75794cfd31eaf768ec5a3e62844.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/network/access/qhttp.cpp')
| -rw-r--r-- | src/network/access/qhttp.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp index f006fba..7365435 100644 --- a/src/network/access/qhttp.cpp +++ b/src/network/access/qhttp.cpp @@ -3115,14 +3115,14 @@ void QHttpPrivate::setSock(QTcpSocket *sock) QObject::connect(socket, SIGNAL(bytesWritten(qint64)), q, SLOT(_q_slotBytesWritten(qint64))); #ifndef QT_NO_NETWORKPROXY - QObject::connect(socket, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)), - q, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *))); + QObject::connect(socket, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)), + q, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*))); #endif #ifndef QT_NO_OPENSSL if (qobject_cast<QSslSocket *>(socket)) { - QObject::connect(socket, SIGNAL(sslErrors(const QList<QSslError> &)), - q, SIGNAL(sslErrors(const QList<QSslError> &))); + QObject::connect(socket, SIGNAL(sslErrors(QList<QSslError>)), + q, SIGNAL(sslErrors(QList<QSslError>))); QObject::connect(socket, SIGNAL(encryptedBytesWritten(qint64)), q, SLOT(_q_slotEncryptedBytesWritten(qint64))); } |