diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-03 06:41:07 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-03 06:41:07 (GMT) |
| commit | e80295fff0836268d357488feaefb874b458e8ab (patch) | |
| tree | e7c283b015fe520654c50c4fb10a62982077bd4f /src/network | |
| parent | ba7fdc51a2cc0792ceeaf51edce7863c94d96249 (diff) | |
| parent | 29f24e41b91c05d551c7ac16625a2961744c8339 (diff) | |
| download | Qt-e80295fff0836268d357488feaefb874b458e8ab.zip Qt-e80295fff0836268d357488feaefb874b458e8ab.tar.gz Qt-e80295fff0836268d357488feaefb874b458e8ab.tar.bz2 | |
Merge commit 'BearerIntegration-5' into remove-manual-test
Conflicts:
tests/auto/qnetworksession/lackey/lackey.pro
tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/bearer/qnetworksession.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp index 01784e2..c00921f 100644 --- a/src/network/bearer/qnetworksession.cpp +++ b/src/network/bearer/qnetworksession.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -376,6 +376,9 @@ QNetworkConfiguration QNetworkSession::configuration() const The returned interface may change as a result of a roaming process. + Note: this function does not work in Symbian emulator due to the way the + connectivity is emulated on Windows. + \sa state() */ QNetworkInterface QNetworkSession::interface() const |