summaryrefslogtreecommitdiffstats
path: root/tests/auto/qpainter
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/qpainter
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/qpainter')
-rw-r--r--tests/auto/qpainter/tst_qpainter.cpp37
1 files changed, 0 insertions, 37 deletions
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index 984443490f..25e58b41de 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -54,9 +54,6 @@
#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
#include <qprinter.h>
#include <math.h>
-#ifdef QT3_SUPPORT
-#include <q3painter.h>
-#endif
#endif
#include <qpaintengine.h>
#include <qdesktopwidget.h>
@@ -1271,24 +1268,6 @@ void tst_QPainter::drawRect()
QCOMPARE(painted.width(), rect.width() + increment);
QCOMPARE(painted.height(), rect.height() + increment);
}
-
-#ifdef QT3_SUPPORT
- {
- if (usePen && (rect.width() < 2 || rect.height() < 2))
- return;
- pixmap.fill(Qt::white);
- Q3Painter p(&pixmap);
- p.setPen(usePen ? QPen(Qt::black) : QPen(Qt::NoPen));
- p.setBrush(Qt::black);
- p.drawRect(rect);
- p.end();
-
- const QRect painted = getPaintedSize(pixmap, Qt::white);
-
- QCOMPARE(painted.width(), rect.width());
- QCOMPARE(painted.height(), rect.height());
- }
-#endif
}
void tst_QPainter::drawRect2()
@@ -1696,22 +1675,6 @@ void tst_QPainter::drawRoundRect()
QCOMPARE(painted.width(), rect.width() + increment);
QCOMPARE(painted.height(), rect.height() + increment);
}
-
-#ifdef QT3_SUPPORT
- {
- pixmap.fill(Qt::white);
- Q3Painter p(&pixmap);
- p.setPen(usePen ? QPen(Qt::black) : QPen(Qt::NoPen));
- p.setBrush(Qt::black);
- p.drawRoundRect(rect);
- p.end();
-
- const QRect painted = getPaintedSize(pixmap, Qt::white);
-
- QCOMPARE(painted.width(), rect.width());
- QCOMPARE(painted.height(), rect.height());
- }
-#endif
}
Q_DECLARE_METATYPE(QImage::Format)