diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-02-03 12:16:35 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-02-04 12:09:42 (GMT) |
| commit | 8fe811e14b6db6a9637a5bf6d276613786291762 (patch) | |
| tree | 1e23b78e69072d703870e8f27e12e5ff4153f6be /src/network/bearer | |
| parent | 231dcfc8b6a90c3a0ab4869e0a9ab45403fd9a8c (diff) | |
| download | Qt-8fe811e14b6db6a9637a5bf6d276613786291762.zip Qt-8fe811e14b6db6a9637a5bf6d276613786291762.tar.gz Qt-8fe811e14b6db6a9637a5bf6d276613786291762.tar.bz2 | |
Fix random crashes when bearer suddenly goes down
1. QNetworkSession being deleted from the closed signal caused data
abort or E32User-CBase 49 panics. (both observed)
2. Potential E32User-CBase 46 panic in
ConnectionProgressNotifier::StartNotifications()
Reviewed-by: Aaron Tunney
Reviewed-By: Markus Goetz
Task-Number: QTBUG-17196
Diffstat (limited to 'src/network/bearer')
| -rw-r--r-- | src/network/bearer/qnetworksession.cpp | 3 | ||||
| -rw-r--r-- | src/network/bearer/qnetworksession.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp index b0b7d3d..9503553 100644 --- a/src/network/bearer/qnetworksession.cpp +++ b/src/network/bearer/qnetworksession.cpp @@ -250,6 +250,9 @@ QNetworkSession::QNetworkSession(const QNetworkConfiguration& connectionConfig, break; } } + + qRegisterMetaType<QNetworkSession::State>(); + qRegisterMetaType<QNetworkSession::SessionError>(); } /*! diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h index c51cb4f..0bca4b6 100644 --- a/src/network/bearer/qnetworksession.h +++ b/src/network/bearer/qnetworksession.h @@ -139,6 +139,9 @@ private: friend class QNetworkSessionPrivate; }; +Q_DECLARE_METATYPE(QNetworkSession::State); +Q_DECLARE_METATYPE(QNetworkSession::SessionError); + #ifndef QT_MOBILITY_BEARER QT_END_NAMESPACE #else |