From c8c0bdffb7d75840b99e5a10dae57ea2172a8eac Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Tue, 16 Oct 2012 14:39:15 +0200 Subject: [PATCH] Test: remove QSKIP in tst_QDataStream::stream_QPixmap Instead omit the whole test when Q_OS_WINCE is defined. Change-Id: I356af3ea145012142b3cf2af0b5d813d4be07a25 Reviewed-by: J-P Nurmi --- .../auto/corelib/io/qdatastream/tst_qdatastream.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp index e0f479524f..21089b5a1b 100644 --- a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp @@ -103,8 +103,10 @@ private slots: void stream_QPen_data(); void stream_QPen(); +#ifndef Q_OS_WINCE void stream_QPixmap_data(); void stream_QPixmap(); +#endif void stream_QPoint_data(); void stream_QPoint(); @@ -1526,20 +1528,21 @@ void tst_QDataStream::readQPen(QDataStream *s) // pixmap testing is currently limited to one pixmap only. // +#ifndef Q_OS_WINCE +// Test depends on more memory than available on Qt/CE void tst_QDataStream::stream_QPixmap_data() { -#ifndef Q_OS_WINCE stream_data(1); -#endif } +#endif +#ifndef Q_OS_WINCE +// Test depends on more memory than available on Qt/CE void tst_QDataStream::stream_QPixmap() { -#ifdef Q_OS_WINCE - QSKIP("Test depends on more memory than available on Qt/CE"); -#endif STREAM_IMPL(QPixmap); } +#endif void tst_QDataStream::stream_QIcon_data() {