diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-17 06:53:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-17 06:53:35 (GMT) |
| commit | 07a22fc4a00901f2ff769346cb1ada6fc8a2bd90 (patch) | |
| tree | 4a80562176de3b9f5d3d13a079da6d153045f6b8 /src/network/access/qnetworkaccessmanager.h | |
| parent | 4631d297781b8ad4eba0735b7023265d4872c1cb (diff) | |
| parent | ec4b73992eb7fb7254bb7a1524b8691ef2123b9f (diff) | |
| download | Qt-07a22fc4a00901f2ff769346cb1ada6fc8a2bd90.zip Qt-07a22fc4a00901f2ff769346cb1ada6fc8a2bd90.tar.gz Qt-07a22fc4a00901f2ff769346cb1ada6fc8a2bd90.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:
Workaround crash when multiple QNetworkAccessManager instances are used
Diffstat (limited to 'src/network/access/qnetworkaccessmanager.h')
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h index f3e502c..7ef009f 100644 --- a/src/network/access/qnetworkaccessmanager.h +++ b/src/network/access/qnetworkaccessmanager.h @@ -161,8 +161,6 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_replySslErrors(QList<QSslError>)) #if !defined(QT_NO_BEARERMANAGEMENT) && !defined(QT_MOBILITY_BEARER) Q_PRIVATE_SLOT(d_func(), void _q_networkSessionClosed()) - Q_PRIVATE_SLOT(d_func(), void _q_networkSessionNewConfigurationActivated()) - Q_PRIVATE_SLOT(d_func(), void _q_networkSessionPreferredConfigurationChanged(QNetworkConfiguration,bool)) Q_PRIVATE_SLOT(d_func(), void _q_networkSessionStateChanged(QNetworkSession::State)) #endif }; |