diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-01 22:43:48 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-01 22:43:48 (GMT) |
| commit | b52bfac9d05de835682b9c2b2e1d79e0246e708a (patch) | |
| tree | 456eb1b84771bb619877a9765bb9e431a073eb0b /src/network/ssl | |
| parent | 93906071c31a5008625e727dad530a6f05441baa (diff) | |
| parent | add57539ec7cd24346e26b22a5298da50d81e91b (diff) | |
| download | Qt-b52bfac9d05de835682b9c2b2e1d79e0246e708a.zip Qt-b52bfac9d05de835682b9c2b2e1d79e0246e708a.tar.gz Qt-b52bfac9d05de835682b9c2b2e1d79e0246e708a.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/qsslsocket.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 6858d40..0e0c347 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -1745,7 +1745,13 @@ qint64 QSslSocket::writeData(const char *data, qint64 len) \internal */ QSslSocketPrivate::QSslSocketPrivate() - : initialized(false), readyReadEmittedPointer(0), plainSocket(0) + : initialized(false) + , mode(QSslSocket::UnencryptedMode) + , autoStartHandshake(false) + , connectionEncrypted(false) + , ignoreAllSslErrors(false) + , readyReadEmittedPointer(0) + , plainSocket(0) { QSslConfigurationPrivate::deepCopyDefaultConfiguration(&configuration); } |