path: root/examples/painting/imagecomposition
diff options
authorThiago Macieira <>2011-05-16 13:20:25 +0200
committerQt Continuous Integration System <>2011-06-07 15:14:56 +0200
commitdddfcd66f8b0a9aaff97d9cccf94564191800869 (patch)
treec40af3099baeb779a8649102569556efe4d3e614 /examples/painting/imagecomposition
parentae3b5b3ab4b9c268db8230cc2ac5edac3680a2d8 (diff)
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: Reviewed-by: Qt Sanity Bot <> Reviewed-by: Peter Hartmann <>
Diffstat (limited to 'examples/painting/imagecomposition')
0 files changed, 0 insertions, 0 deletions