summaryrefslogtreecommitdiffstats
path: root/tests/auto/qpixmap
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-05-17 13:43:30 +1000
committerJason McDonald <jason.mcdonald@nokia.com>2011-05-18 16:09:29 +1000
commit49babe02f0a00fe2baff3950fbdcb725ce20d772 (patch)
treee0383c879f78ef74ba7a0fe394504c096312edf4 /tests/auto/qpixmap
parent0cd93933d8e5cc69151958fc285936854ff86e47 (diff)
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
Diffstat (limited to 'tests/auto/qpixmap')
-rw-r--r--tests/auto/qpixmap/tst_qpixmap.cpp52
1 files changed, 0 insertions, 52 deletions
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp
index 2cd9b133ac..216ca9b7c8 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/qpixmap/tst_qpixmap.cpp
@@ -164,11 +164,6 @@ private slots:
void copy();
void depthOfNullObjects();
-#ifdef QT3_SUPPORT
- void resize();
- void resizePreserveMask();
-#endif
-
void transformed();
void transformed2();
@@ -1427,53 +1422,6 @@ void tst_QPixmap::copy()
QVERIFY(pixmapsAreEqual(&trans, &transCopy));
}
-#ifdef QT3_SUPPORT
-void tst_QPixmap::resize()
-{
- QPixmap p1(10, 10);
- p1.fill(Qt::red);
-
- QPixmap p2 = p1;
- QPixmap p3(50, 50);
- p3.fill(Qt::red);
-
- p1.resize(p3.size());
- p1.resize(p2.size());
- p3.resize(p2.size());
- QCOMPARE(p1.toImage(), p2.toImage());
- QCOMPARE(p1.toImage(), p3.toImage());
-
- QBitmap b1;
- b1.resize(10, 10);
- QVERIFY(b1.depth() == 1);
- QPixmap p4;
- p4.resize(10, 10);
- QVERIFY(p4.depth() != 0);
-}
-
-void tst_QPixmap::resizePreserveMask()
-{
- QPixmap pm(100, 100);
- pm.fill(Qt::transparent);
- QPainter p(&pm);
- p.fillRect(10, 10, 80, 80, Qt::red);
- p.drawRect(0, 0, 99, 99);
- p.end();
-
- QBitmap mask = pm.mask();
- pm.resize(50, 50);
-
- QCOMPARE(pm.mask().toImage(), mask.toImage().copy(0, 0, 50, 50));
-
- pm = QPixmap(100, 100);
- pm.fill(Qt::red);
- pm.setMask(mask);
- pm.resize(50, 50);
-
- QCOMPARE(pm.mask().toImage(), mask.toImage().copy(0, 0, 50, 50));
-}
-#endif
-
void tst_QPixmap::depthOfNullObjects()
{
QBitmap b1;