From 49babe02f0a00fe2baff3950fbdcb725ce20d772 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 17 May 2011 13:43:30 +1000 Subject: Remove autotest code for Qt3Support library. This commit deals with the simple cases -- mostly just removing blocks of code enclosed in #ifdef QT3_SUPPORT. Later commits will deal with the trickier cases. Change-Id: I280dea25b3754be175efe62fc7e5e4e7c304e658 Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern --- tests/auto/qimage/tst_qimage.cpp | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'tests/auto/qimage/tst_qimage.cpp') diff --git a/tests/auto/qimage/tst_qimage.cpp b/tests/auto/qimage/tst_qimage.cpp index ad85bf5cce..49acb98a6a 100644 --- a/tests/auto/qimage/tst_qimage.cpp +++ b/tests/auto/qimage/tst_qimage.cpp @@ -73,7 +73,6 @@ private slots: void create(); void createInvalidXPM(); void createFromUChar(); - void convertBitOrder(); void formatHandlersInput_data(); void formatHandlersInput(); @@ -265,32 +264,6 @@ void tst_QImage::createFromUChar() QCOMPARE(i4.pixel(0,0), 6U); } -void tst_QImage::convertBitOrder() -{ -#if !defined(QT3_SUPPORT) - QSKIP("Qt compiled without Qt3Support", SkipAll); -#else - QImage i(9,5,1,2,QImage::LittleEndian); - qMemSet(i.bits(), 0, i.byteCount()); - - i.setDotsPerMeterX(9); - i.setDotsPerMeterY(5); - i.fill(0x12345678); - QVERIFY(!i.isNull()); - - QImage ni = i.convertBitOrder(QImage::BigEndian); - QVERIFY(!ni.isNull()); - QVERIFY(ni.bitOrder() == QImage::BigEndian); - - // A bunch of verifies to make sure that nothing was lost - QVERIFY(i.dotsPerMeterX() == ni.dotsPerMeterX()); - QVERIFY(i.dotsPerMeterY() == ni.dotsPerMeterY()); - QVERIFY(i.depth() == ni.depth()); - QVERIFY(i.size() == ni.size()); - QVERIFY(i.colorCount() == ni.colorCount()); -#endif -} - void tst_QImage::formatHandlersInput_data() { QTest::addColumn("testFormat"); -- cgit v1.2.3