diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 16:35:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 16:35:57 (GMT) |
| commit | 50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5 (patch) | |
| tree | 7517568b333bcc5679e7a165c48aaa7bd06a66fb /tests/manual | |
| parent | 61f013168e5ef5111948a1ae0a1464753986adb2 (diff) | |
| parent | ce40a078caa4a09793128ca730cc5ca268aeee87 (diff) | |
| download | Qt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.zip Qt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.tar.gz Qt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/bearerex/datatransferer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/manual/bearerex/datatransferer.cpp b/tests/manual/bearerex/datatransferer.cpp index c3c13a8..c449bb1 100644 --- a/tests/manual/bearerex/datatransferer.cpp +++ b/tests/manual/bearerex/datatransferer.cpp @@ -121,7 +121,7 @@ void DataTransfererQTcp::readyRead() qDebug() << "BearerEx DataTransferQTcp data received: " << data; m_dataTransferOngoing = false; - // m_qsocket.error() returns uninitialized value in case no error has occured, + // m_qsocket.error() returns uninitialized value in case no error has occurred, // so emit '0' emit finished(0, bytesAvailable, "QAbstractSocket::SocketError"); } |