summaryrefslogtreecommitdiffstats
path: root/src/network/ssl
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-12 18:30:24 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-12 18:30:24 (GMT)
commit2044890bb807dc5879d7cbb1863c56c64249c3ef (patch)
tree33b400e53b71ccd6ac5ea0da41cb9285aafaa988 /src/network/ssl
parent0ef6bb1dfadf8e83f20e2282ff4a73a466b3de87 (diff)
parent1db8232bd50874b3db16031b9c8ef13984bf32dd (diff)
downloadQt-2044890bb807dc5879d7cbb1863c56c64249c3ef.zip
Qt-2044890bb807dc5879d7cbb1863c56c64249c3ef.tar.gz
Qt-2044890bb807dc5879d7cbb1863c56c64249c3ef.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed app freeze if switching to offline in middle of HTTP transaction. Document Symbian platform security requirements on Qt APIs Fixed app freeze if switching to offline in middle of HTTP transaction. Removed QtDeclarative.dll deployment from qt.iby in 4.6 branch. Don't build QtXmlPatterns' command line tools on Symbian.
Diffstat (limited to 'src/network/ssl')
-rw-r--r--src/network/ssl/qsslsocket.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 9623570..7ad471c 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -156,6 +156,16 @@
is being encrypted and encryptedBytesWritten()
will get emitted as soon as data has been written to the TCP socket.
+ \section1 Symbian Platform Security Requirements
+
+ On Symbian, processes which use this class must have the
+ \c NetworkServices platform security capability. If the client
+ process lacks this capability, operations will fail.
+
+ Platform security capabilities are added via the
+ \l{qmake-variable-reference.html#target-capability}{TARGET.CAPABILITY}
+ qmake variable.
+
\sa QSslCertificate, QSslCipher, QSslError
*/