diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-20 19:31:55 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-20 19:31:55 +0200 |
commit | 5110f89b2bb1ca22b9f2bd254287696636082332 (patch) | |
tree | b20b5c97a7a38339af134b1ba8ff4729b54877ce /tests/auto/qserialport/tst_qserialport.cpp | |
parent | add8cb835b7e519955f1260244f7033b049d4930 (diff) | |
parent | 9e8daaed0466d760e047c5da58811e55e7807c0a (diff) | |
download | qtserialport-5110f89b2bb1ca22b9f2bd254287696636082332.tar.gz |
Merge 5.7 into 5.7.0
Change-Id: I2e0737fab1c12657d8dc7de5d1882ecb73bbb5f2
Diffstat (limited to 'tests/auto/qserialport/tst_qserialport.cpp')
-rw-r--r-- | tests/auto/qserialport/tst_qserialport.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qserialport/tst_qserialport.cpp b/tests/auto/qserialport/tst_qserialport.cpp index f100d35..b9d41b8 100644 --- a/tests/auto/qserialport/tst_qserialport.cpp +++ b/tests/auto/qserialport/tst_qserialport.cpp @@ -265,7 +265,7 @@ void tst_QSerialPort::openExisting() QFETCH(bool, openResult); QFETCH(QSerialPort::SerialPortError, errorCode); - foreach (const QString &serialPortName, m_availablePortNames) { + for (const QString &serialPortName : qAsConst(m_availablePortNames)) { QSerialPort serialPort(serialPortName); QSignalSpy errorSpy(&serialPort, static_cast<void (QSerialPort::*)(QSerialPort::SerialPortError)>(&QSerialPort::error)); QVERIFY(errorSpy.isValid()); @@ -1055,9 +1055,9 @@ void tst_QSerialPort::controlBreak() QVERIFY2(!timeout(), "Timed out when waiting for the read of break state."); QVERIFY(receiverPort.bytesAvailable() > 0); - foreach (const char c, receiverPort.readAll()) { - QCOMPARE(c, char(0)); - } + const QByteArray actual = receiverPort.readAll(); + const QByteArray expected(actual.size(), '\0'); + QCOMPARE(actual, expected); QVERIFY(senderPort.setBreakEnabled(false)); QCOMPARE(senderPort.isBreakEnabled(), false); |