From 0b23cd186c0113692031176f43b7157539174d9d Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Thu, 18 Oct 2012 09:56:57 +0200 Subject: Test: remove QSKIP in tst_QDataStream::stream_QIcon Instead omit the whole test when Q_OS_WINCE is defined. Change-Id: Ic69accb138121d2b39f068cef181da13b18e46ee Reviewed-by: J-P Nurmi --- tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp index 21089b5a1b..ef384f86cd 100644 --- a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp @@ -138,8 +138,10 @@ private slots: void stream_qint64_data(); void stream_qint64(); +#ifndef Q_OS_WINCE void stream_QIcon_data(); void stream_QIcon(); +#endif void stream_QEasingCurve_data(); void stream_QEasingCurve(); @@ -1544,20 +1546,18 @@ void tst_QDataStream::stream_QPixmap() } #endif +#ifndef Q_OS_WINCE +// Test depends on more memory than available on Qt/CE void tst_QDataStream::stream_QIcon_data() { -#ifndef Q_OS_WINCE stream_data(1); -#endif } void tst_QDataStream::stream_QIcon() { -#ifdef Q_OS_WINCE - QSKIP("Test depends on more memory than available on Qt/CE"); -#endif STREAM_IMPL(QIcon); } +#endif void tst_QDataStream::writeQPixmap(QDataStream *s) { -- cgit v1.2.3