diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-26 00:08:21 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-26 00:08:21 (GMT) |
| commit | 82c4fe87a9b2f65354803b9b6dc2054c4c63c8e8 (patch) | |
| tree | 2d206134bb71260fa580160c7c75c351a4867e29 /src/network/access/qnetworkreplyimpl_p.h | |
| parent | 9f6b271e942d48cef566891bd9d9712e147df3a2 (diff) | |
| parent | f75961dfd20b82f2f5e2a4b7feaf59c841a93f6b (diff) | |
| download | Qt-82c4fe87a9b2f65354803b9b6dc2054c4c63c8e8.zip Qt-82c4fe87a9b2f65354803b9b6dc2054c4c63c8e8.tar.gz Qt-82c4fe87a9b2f65354803b9b6dc2054c4c63c8e8.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, |