Fix regression that caused waitForXXX(-1) to fail.
authorThiago Macieira <thiago.macieira@nokia.com>
Mon, 16 May 2011 11:20:25 +0000 (13:20 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 7 Jun 2011 13:14:56 +0000 (15:14 +0200)
commitdddfcd66f8b0a9aaff97d9cccf94564191800869
treec40af3099baeb779a8649102569556efe4d3e614
parentae3b5b3ab4b9c268db8230cc2ac5edac3680a2d8
Fix regression that caused waitForXXX(-1) to fail.

Regression was introduced by 8d4cd52b6981a4e6deea7fdb77f56e40c4f3e6ba
when it failed to check when msecs == -1. This manifested visibly in KDE
failing to connect to any SSL site -- kioslaves are synchronous and use
waitForXXX(-1) (in this particular case, waitForEncrypted, which calls
waitForReadyRead).

Also, take the opportunity to convert these tests in QTcpSocket to use
port 80 (a defined service in the test server) instead of port 22.

Reviewed-by: Martin Petersson
(cherry picked from commit cb5b6799333794496269aa7e6515f96c2ac96d37)

Change-Id: I256a1e138e43fd45844976fe84cd2bc938552e47
Reviewed-on: http://codereview.qt.nokia.com/359
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
src/network/socket/qabstractsocket.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
tests/auto/qtcpsocket/tst_qtcpsocket.cpp