diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-11 02:42:42 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-11 03:00:36 (GMT) |
| commit | c2b9767dfc0fb2f26ff52bdded36c76c0a23f938 (patch) | |
| tree | 023dc94e69678e6439c36c43579088d4ce61692c /src/network | |
| parent | 12b70a4c52f57255da9586a0f92324557d400c8e (diff) | |
| download | Qt-c2b9767dfc0fb2f26ff52bdded36c76c0a23f938.zip Qt-c2b9767dfc0fb2f26ff52bdded36c76c0a23f938.tar.gz Qt-c2b9767dfc0fb2f26ff52bdded36c76c0a23f938.tar.bz2 | |
Fix after reworking to use signals/slots.
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 2 | ||||
| -rw-r--r-- | src/network/access/qnetworkreplyimpl.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 3324e09..9c1e268 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -1139,8 +1139,6 @@ void QNetworkAccessManagerPrivate::_q_networkSessionPreferredConfigurationChange { Q_Q(QNetworkAccessManager); - emit q->networkSessionOnline(); - networkSession->migrate(); } diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index afa7307..81d4d0d 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -574,7 +574,7 @@ void QNetworkReplyImplPrivate::finished() if (migrateBackend()) { // either we are migrating or the request is finished/aborted - if (state == Reconnecting) { + if (state == Reconnecting || state == WaitingForSession) { resumeNotificationHandling(); return; // exit early if we are migrating. } |