diff options
author | Warwick Allison <warwick.allison@nokia.com> | 2009-06-19 04:36:47 (GMT) |
---|---|---|
committer | Warwick Allison <warwick.allison@nokia.com> | 2009-06-19 04:36:47 (GMT) |
commit | fbf9db1fc6b500bfe05fdfca121986687d73d5c6 (patch) | |
tree | 0ab6e8834aa4cf7068df121d7f2a1f290b8a2726 /src/network/ssl/qsslsocket.cpp | |
parent | 4383d5a9dae96bb87f824088d1b565a2fad09b18 (diff) | |
parent | 7d8cd9b7c2f857b9e065d9eebd169d2299dcf35b (diff) | |
download | Qt-fbf9db1fc6b500bfe05fdfca121986687d73d5c6.zip Qt-fbf9db1fc6b500bfe05fdfca121986687d73d5c6.tar.gz Qt-fbf9db1fc6b500bfe05fdfca121986687d73d5c6.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/network/ssl/qsslsocket.cpp')
-rw-r--r-- | src/network/ssl/qsslsocket.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 0a049b8..fc297e4 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtNetwork module of the Qt Toolkit. ** @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. +** contact the sales department at http://www.qtsoftware.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -1557,7 +1557,7 @@ void QSslSocket::startServerEncryption() { Q_D(QSslSocket); if (d->mode != UnencryptedMode) { - qWarning("QSslSocket::startClientEncryption: cannot start handshake on non-plain connection"); + qWarning("QSslSocket::startServerEncryption: cannot start handshake on non-plain connection"); return; } #ifdef QSSLSOCKET_DEBUG |