diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 14:00:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 14:00:05 (GMT) |
| commit | ce40a078caa4a09793128ca730cc5ca268aeee87 (patch) | |
| tree | e29aa8e561552721ad3f7ed42cdae99b23ec0960 /tests | |
| parent | 022884db790a7592fa017add4ea9669d8b5598ca (diff) | |
| parent | 0ade09152067324f74678f2de4d447b6e0280600 (diff) | |
| download | Qt-ce40a078caa4a09793128ca730cc5ca268aeee87.zip Qt-ce40a078caa4a09793128ca730cc5ca268aeee87.tar.gz Qt-ce40a078caa4a09793128ca730cc5ca268aeee87.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fixed many spelling errors.
Diffstat (limited to 'tests')
| -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"); } |