diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-15 07:45:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-15 07:45:43 (GMT) |
| commit | c1026caddce5261b7cb944e36fff30a006e6d8c1 (patch) | |
| tree | ba686e54f286a65d735cc7d5844906848a537ea8 /src/network/access/qnetworkreplyimpl_p.h | |
| parent | 1c1a5fe0e2d9e28be5e0e14732d79d34c9bb2a74 (diff) | |
| parent | ada33b11092f278ae4f1280a6da07ffd151a31b6 (diff) | |
| download | Qt-c1026caddce5261b7cb944e36fff30a006e6d8c1.zip Qt-c1026caddce5261b7cb944e36fff30a006e6d8c1.tar.gz Qt-c1026caddce5261b7cb944e36fff30a006e6d8c1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Refactor dangerous multiple inheritance
Fix RConnection handle leak in symbian bearer plugin
Prevent crash when cache is changed on the fly
Diffstat (limited to 'src/network/access/qnetworkreplyimpl_p.h')
| -rw-r--r-- | src/network/access/qnetworkreplyimpl_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h index 31da297..0e4ff8f 100644 --- a/src/network/access/qnetworkreplyimpl_p.h +++ b/src/network/access/qnetworkreplyimpl_p.h @@ -103,6 +103,7 @@ public: Q_PRIVATE_SLOT(d_func(), void _q_networkSessionConnected()) Q_PRIVATE_SLOT(d_func(), void _q_networkSessionFailed()) #endif + Q_PRIVATE_SLOT(d_func(), void _q_cacheDestroyed()) }; class QNetworkReplyImplPrivate: public QNetworkReplyPrivate @@ -139,6 +140,7 @@ public: void _q_networkSessionConnected(); void _q_networkSessionFailed(); #endif + void _q_cacheDestroyed(); void setup(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData); |