diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-17 21:02:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-17 21:02:20 (GMT) |
| commit | d30a66d1382395dbf92eee5f6792be1b329153c6 (patch) | |
| tree | 55aef912336ecfc778d4952578edb367f5af4d3a | |
| parent | 0d3786a9cd6dc3c4dd17a7e98fe138a7abaabb29 (diff) | |
| parent | 58123db900c339a7df8fb7f8b24e210fbfb70182 (diff) | |
| download | Qt-d30a66d1382395dbf92eee5f6792be1b329153c6.zip Qt-d30a66d1382395dbf92eee5f6792be1b329153c6.tar.gz Qt-d30a66d1382395dbf92eee5f6792be1b329153c6.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix waitForOpened not working with already active configuration
| -rw-r--r-- | src/network/bearer/qnetworksession.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp index 226c3c5..db1a37c 100644 --- a/src/network/bearer/qnetworksession.cpp +++ b/src/network/bearer/qnetworksession.cpp @@ -310,8 +310,9 @@ bool QNetworkSession::waitForOpened(int msecs) if (d->isOpen) return true; - if (d->state != Connecting) + if (!(d->state == Connecting || d->state == Connected)) { return false; + } QEventLoop* loop = new QEventLoop(this); QObject::connect(d, SIGNAL(quitPendingWaitsForOpened()), |