diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-07-26 09:44:05 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-03 11:24:28 +0200 |
| commit | dbe4b45f9b5149f80f8292b61be68b4020a05b55 (patch) | |
| tree | 69705aff124eff4d219ca80fec35695606c1fdd8 /tests/auto/gui | |
| parent | 621e434ffeb7b43ee49a751def8a6eb79173f89b (diff) | |
Remove some dead code wrapped in Q_WS_QWS.
Change-Id: Ie1ee8c4af603b924abe40145041357981d174445
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Diffstat (limited to 'tests/auto/gui')
| -rw-r--r-- | tests/auto/gui/image/qimage/tst_qimage.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/gui/image/qpixmap/tst_qpixmap.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/gui/painting/qpainter/tst_qpainter.cpp | 4 |
3 files changed, 2 insertions, 9 deletions
diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp index 65571f13c2..0fad243cb2 100644 --- a/tests/auto/gui/image/qimage/tst_qimage.cpp +++ b/tests/auto/gui/image/qimage/tst_qimage.cpp @@ -171,14 +171,14 @@ void tst_QImage::swap() void tst_QImage::create() { bool cr = true; -#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) +#if !defined(Q_OS_WINCE) QT_TRY { #endif //QImage image(7000000, 7000000, 8, 256, QImage::IgnoreEndian); QImage image(7000000, 7000000, QImage::Format_Indexed8); image.setColorCount(256); cr = !image.isNull(); -#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) +#if !defined(Q_OS_WINCE) } QT_CATCH (...) { } #endif diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp index 6fe8727294..68354744a9 100644 --- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp @@ -63,9 +63,6 @@ #include <windows.h> #endif -#ifdef Q_WS_QWS -#include <qscreen_qws.h> -#endif Q_DECLARE_METATYPE(QImage::Format) diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp index 2ff6098035..bd075eb2fe 100644 --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp @@ -3580,9 +3580,6 @@ void tst_QPainter::linearGradientSymmetry_data() void tst_QPainter::linearGradientSymmetry() { -#ifdef Q_WS_QWS - QSKIP("QWS has limited resolution in the gradient color table"); -#else QFETCH(QGradientStops, stops); QImage a(64, 8, QImage::Format_ARGB32_Premultiplied); @@ -3604,7 +3601,6 @@ void tst_QPainter::linearGradientSymmetry() b = b.mirrored(true); QCOMPARE(a, b); -#endif } void tst_QPainter::gradientInterpolation() |