diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-19 16:35:06 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-19 16:35:06 (GMT) |
| commit | 901b0391d15ab72830fcfd73048eeff03fb9ed07 (patch) | |
| tree | cf5f2f2eab83301bf08952426f25eb54a90e9ac4 /src/network/access/qhttp.cpp | |
| parent | bb4e301ce6762ab300618c579bd65ea1ee17dc2d (diff) | |
| parent | 34044853d4315309920a481a585f96ba7b3fb140 (diff) | |
| download | Qt-901b0391d15ab72830fcfd73048eeff03fb9ed07.zip Qt-901b0391d15ab72830fcfd73048eeff03fb9ed07.tar.gz Qt-901b0391d15ab72830fcfd73048eeff03fb9ed07.tar.bz2 | |
Merge remote branch 'mainline/4.6' 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))); } |