diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-03-26 08:04:10 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-03-26 08:04:10 (GMT) |
| commit | 43381162eac93f0fbe10e06944c59158dccb3d8c (patch) | |
| tree | 6eb3ad70f0074aaf662c83dce56281613c9219bc /src/network/access/qnetworkreplyimpl_p.h | |
| parent | a0548f2fc01a47c1b5de4d967d0bc920bd1867f6 (diff) | |
| parent | d432123cec9ac927ec9162fa8b3d16684483f994 (diff) | |
| download | Qt-43381162eac93f0fbe10e06944c59158dccb3d8c.zip Qt-43381162eac93f0fbe10e06944c59158dccb3d8c.tar.gz Qt-43381162eac93f0fbe10e06944c59158dccb3d8c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/network/access/qnetworkreplyimpl_p.h')
| -rw-r--r-- | src/network/access/qnetworkreplyimpl_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h index 6045ef4..fcb3397 100644 --- a/src/network/access/qnetworkreplyimpl_p.h +++ b/src/network/access/qnetworkreplyimpl_p.h @@ -99,7 +99,7 @@ public: Q_PRIVATE_SLOT(d_func(), void _q_copyReadChannelFinished()) Q_PRIVATE_SLOT(d_func(), void _q_bufferOutgoingData()) Q_PRIVATE_SLOT(d_func(), void _q_bufferOutgoingDataFinished()) - Q_PRIVATE_SLOT(d_func(), void _q_networkSessionOnline()) + Q_PRIVATE_SLOT(d_func(), void _q_networkSessionConnected()) Q_PRIVATE_SLOT(d_func(), void _q_networkSessionFailed()) }; @@ -133,7 +133,7 @@ public: void _q_copyReadChannelFinished(); void _q_bufferOutgoingData(); void _q_bufferOutgoingDataFinished(); - void _q_networkSessionOnline(); + void _q_networkSessionConnected(); void _q_networkSessionFailed(); void setup(QNetworkAccessManager::Operation op, const QNetworkRequest &request, |