From 555e4e05f4f98f524e108fba0fb236406f2e2b2f Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Wed, 15 Aug 2012 12:04:35 +0200 Subject: Fix tst_qbytearray on QNX qUncompressCorruptedData() no longer hangs on QNX 650 and Blackberry OS sytems. Change-Id: Id131f9f1c6dcd358c152675c7e29ab937052c1d0 Reviewed-by: Thiago Macieira --- tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp index aa17a499a1..a28bc8172e 100644 --- a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp +++ b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp @@ -307,11 +307,11 @@ void tst_QByteArray::qUncompressCorruptedData_data() } // Corrupt data causes this test to lock up on HP-UX / PA-RISC with gcc, -// SOLARIS, QNX and Windows. +// SOLARIS, and Windows. // This test is expected to produce some warning messages in the test output. void tst_QByteArray::qUncompressCorruptedData() { -#if !(defined(Q_OS_HPUX) && !defined(__ia64) && defined(Q_CC_GNU)) && !defined(Q_OS_SOLARIS) && !defined(Q_OS_QNX) && !defined(Q_OS_WIN) +#if !(defined(Q_OS_HPUX) && !defined(__ia64) && defined(Q_CC_GNU)) && !defined(Q_OS_SOLARIS) && !defined(Q_OS_WIN) QFETCH(QByteArray, in); QByteArray res; @@ -1904,5 +1904,5 @@ void tst_QByteArray::literals() const char globalChar = '1'; -QTEST_APPLESS_MAIN(tst_QByteArray) +QTEST_MAIN(tst_QByteArray) #include "tst_qbytearray.moc" -- cgit v1.2.3