diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-19 10:07:06 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-19 10:07:06 +1000 |
commit | 429946733541fdcdea13d5e470f61ac530b53980 (patch) | |
tree | 75aa2742fa90d497e092cf5a9a7210b39edc4986 /tests/auto/qpainter/tst_qpainter.cpp | |
parent | f5ec7f0f6bbedc537b1ad71bab7a806a6e0d85c3 (diff) | |
parent | 9a6a58a95af31816627550c573c1b2ac39fc404e (diff) |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
tests: fixed compilation of tst_qtextstream
QUiLoader, QAbstractFormBuilder: Introduce errorString().
Enable configuration for Xcb
Fall back to using paths for large fonts in drawStaticText()
Add ability to work around non-standard GLES implementations
Fix broken drawing with large fonts using QStaticText and FreeType
Remove Q_ASSERT's from qdbustype autotest
Remove autotest code for Qt3Support library.
Diffstat (limited to 'tests/auto/qpainter/tst_qpainter.cpp')
-rw-r--r-- | tests/auto/qpainter/tst_qpainter.cpp | 37 |
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) |