diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 11:59:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 11:59:28 (GMT) |
| commit | 4e8ee4b26d5cd80cb85d2dc4a71e62873789d4be (patch) | |
| tree | 4e5011606c5351ebd07ac2c31a20b4825512cc58 /src/network/access/qnetworkaccessmanager_p.h | |
| parent | 267d7ed88d72d2fb3230a1ba5c3aa6b41f9ac79a (diff) | |
| parent | 12b6987031be9faee3886d7623888feb4e1762af (diff) | |
| download | Qt-4e8ee4b26d5cd80cb85d2dc4a71e62873789d4be.zip Qt-4e8ee4b26d5cd80cb85d2dc4a71e62873789d4be.tar.gz Qt-4e8ee4b26d5cd80cb85d2dc4a71e62873789d4be.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:
Update the Qt focus widget on responder change.
Doc: fix spelling errors.
add wifi power notifications. more Qt way for autorelease.
Remove unnecessary qWarnings from bearer management code.
Don't keep polling network sessions open indefinitely.
Prefer ethernet over wlan.
Updating polling mechanism for bearer management engines.
Diffstat (limited to 'src/network/access/qnetworkaccessmanager_p.h')
| -rw-r--r-- | src/network/access/qnetworkaccessmanager_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/access/qnetworkaccessmanager_p.h b/src/network/access/qnetworkaccessmanager_p.h index 8d772f0..0140268 100644 --- a/src/network/access/qnetworkaccessmanager_p.h +++ b/src/network/access/qnetworkaccessmanager_p.h @@ -105,6 +105,7 @@ public: void createSession(const QNetworkConfiguration &config); + void _q_networkSessionClosed(); void _q_networkSessionNewConfigurationActivated(); void _q_networkSessionPreferredConfigurationChanged(const QNetworkConfiguration &config, bool isSeamless); @@ -121,6 +122,7 @@ public: #endif QNetworkSession *networkSession; + QString networkConfiguration; bool networkAccessEnabled; bool initializeSession; |