diff options
| author | Rafael Roquetto <rafael.roquetto.qnx@kdab.com> | 2012-08-15 10:09:09 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-17 08:45:19 (GMT) |
| commit | 916d6ef9aa8d4af5c4e4c020dce9c7e7674268fb (patch) | |
| tree | 84a7658ac06b33072c477409eac8f7403969dd5a /tests/auto/qbytearray | |
| parent | 2db49458c00b17575f04947af7b806502a06bf40 (diff) | |
| download | Qt-916d6ef9aa8d4af5c4e4c020dce9c7e7674268fb.zip Qt-916d6ef9aa8d4af5c4e4c020dce9c7e7674268fb.tar.gz Qt-916d6ef9aa8d4af5c4e4c020dce9c7e7674268fb.tar.bz2 | |
Fix tst_qbytearray on QNX/Blackberry systems
tst_QByteArray::qUncompress() no longer fails on QNX systems.
cherry-picked from qt commit 555e4e05f4f98f524e108fba0fb236406f2e2b2f
Change-Id: Ia88204b42f65a94c3f00c4b618255e1870c5a564
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/qbytearray')
| -rw-r--r-- | tests/auto/qbytearray/qbytearray.pro | 4 | ||||
| -rw-r--r-- | tests/auto/qbytearray/tst_qbytearray.cpp | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/qbytearray/qbytearray.pro b/tests/auto/qbytearray/qbytearray.pro index f195dc8..1841cf8 100644 --- a/tests/auto/qbytearray/qbytearray.pro +++ b/tests/auto/qbytearray/qbytearray.pro @@ -4,13 +4,13 @@ SOURCES += tst_qbytearray.cpp QT = core -wince*|symbian { +wince*|symbian|qnx { addFile.files = rfc3252.txt addFile.path = . DEPLOYMENT += addFile } -wince* { +wince*|qnx { DEFINES += SRCDIR=\\\"./\\\" } else:symbian { TARGET.EPOCHEAPSIZE="0x100 0x800000" diff --git a/tests/auto/qbytearray/tst_qbytearray.cpp b/tests/auto/qbytearray/tst_qbytearray.cpp index 1ac65d6..5615142 100644 --- a/tests/auto/qbytearray/tst_qbytearray.cpp +++ b/tests/auto/qbytearray/tst_qbytearray.cpp @@ -247,8 +247,6 @@ void tst_QByteArray::qUncompress() QSKIP("Corrupt data causes this tests to lock up on HP-UX / PA-RISC with gcc", SkipAll); #elif defined Q_OS_SOLARIS QSKIP("Corrupt data causes this tests to lock up on Solaris", SkipAll); -#elif defined Q_OS_QNX - QSKIP("Corrupt data causes this test to lock up on QNX", SkipAll); #endif QByteArray res; |