diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-14 08:48:16 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-14 08:48:16 (GMT) |
| commit | cf74ef2ca9163ac6e15b6a218ef284f6104cdcab (patch) | |
| tree | 68fc4ba63a8080917550f8c769c8c4e8f64f45a1 /src/network/ssl/qsslsocket_p.h | |
| parent | 3531f4c831407016ef0735d9cdff9b193e4b3f92 (diff) | |
| parent | 862d5433fb694a03715b2327a107b3192b921924 (diff) | |
| download | Qt-cf74ef2ca9163ac6e15b6a218ef284f6104cdcab.zip Qt-cf74ef2ca9163ac6e15b6a218ef284f6104cdcab.tar.gz Qt-cf74ef2ca9163ac6e15b6a218ef284f6104cdcab.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
dist/changes-4.6.1
Diffstat (limited to 'src/network/ssl/qsslsocket_p.h')
| -rw-r--r-- | src/network/ssl/qsslsocket_p.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h index 5615685..8e22664 100644 --- a/src/network/ssl/qsslsocket_p.h +++ b/src/network/ssl/qsslsocket_p.h @@ -83,9 +83,6 @@ public: QList<QSslError> ignoreErrorsList; bool* readyReadEmittedPointer; - QRingBuffer readBuffer; - QRingBuffer writeBuffer; - QSslConfigurationPrivate configuration; QList<QSslError> sslErrors; |