Remove obsolete code from autotests.

Each version of Qt has its own set of autotests, therefore
preprocessor directives relating to obsolete QT_VERSION's
are not necessary.

Reviewed-by: Carlos Duclos

3 files changed, 2 insertions, 20 deletions

diff --git a/tests/benchmarks/qimagereader/tst_qimagereader.cpp b/tests/benchmarks/qimagereader/tst_qimagereader.cpp
index ae7ecb2..1b5acb4 100644
--- a/tests/benchmarks/qimagereader/tst_qimagereader.cpp
+++ b/tests/benchmarks/qimagereader/tst_qimagereader.cpp
@@ -102,9 +102,7 @@ tst_QImageReader::tst_QImageReader()
     images << QPair<QString, QByteArray>(QLatin1String("4bpp-rle.bmp"), QByteArray("bmp"));
     images << QPair<QString, QByteArray>(QLatin1String("tst7.bmp"), QByteArray("bmp"));
     images << QPair<QString, QByteArray>(QLatin1String("16bpp.bmp"), QByteArray("bmp"));
-#if QT_VERSION >= 0x040200
     images << QPair<QString, QByteArray>(QLatin1String("negativeheight.bmp"), QByteArray("bmp"));
-#endif
     images << QPair<QString, QByteArray>(QLatin1String("marble.xpm"), QByteArray("xpm"));
     images << QPair<QString, QByteArray>(QLatin1String("kollada.png"), QByteArray("png"));
     images << QPair<QString, QByteArray>(QLatin1String("teapot.ppm"), QByteArray("ppm"));
diff --git a/tests/benchmarks/qobject/main.cpp b/tests/benchmarks/qobject/main.cpp
index cd8b142..65833b8 100644
--- a/tests/benchmarks/qobject/main.cpp
+++ b/tests/benchmarks/qobject/main.cpp
@@ -42,12 +42,7 @@
 #include <QtGui>
 #include <qtest.h>
 #include "object.h"
-
-#if QT_VERSION >= 0x040000
-#  include <qcoreapplication.h>
-#else
-#  include <qapplication.h>
-#endif
+#include <qcoreapplication.h>
 #include <qdatetime.h>
 
 enum {
@@ -58,7 +53,7 @@ enum {
 class QObjectBenchmark : public QObject
 {
 Q_OBJECT
-private slots:		
+private slots:
     void signal_slot_benchmark();
     void signal_slot_benchmark_data();
     void qproperty_benchmark_data();
@@ -82,13 +77,8 @@ void QObjectBenchmark::signal_slot_benchmark()
 
     Object singleObject;
     Object multiObject;
-#if QT_VERSION >= 0x040000
     singleObject.setObjectName("single");
     multiObject.setObjectName("multi");
-#else
-    singleObject.setName("single");
-    multiObject.setName("double");
-#endif
 
     singleObject.connect(&singleObject, SIGNAL(signal0()), SLOT(slot0()));
 
diff --git a/tests/benchmarks/qpainter/tst_qpainter.cpp b/tests/benchmarks/qpainter/tst_qpainter.cpp
index af2c412..60c099b 100644
--- a/tests/benchmarks/qpainter/tst_qpainter.cpp
+++ b/tests/benchmarks/qpainter/tst_qpainter.cpp
@@ -700,11 +700,7 @@ void tst_QPainter::compositionModes_data()
     QTest::addColumn<QSize>("size");
     QTest::addColumn<QColor>("color");
 
-#if QT_VERSION >= 0x040500
     const int n = QPainter::RasterOp_SourceAndNotDestination;
-#else
-    const int n = QPainter::CompositionMode_Exclusion;
-#endif
     for (int i = 0; i <= n; ++i) {
         QString title("%1:%2");
         QTest::newRow(qPrintable(title.arg(i).arg("10x10:opaque")))
@@ -732,9 +728,7 @@ void tst_QPainter::compositionModes()
     src.fill(color);
 
     QPixmap dest(size);
-#if QT_VERSION >= 0x040500
     if (mode < QPainter::RasterOp_SourceOrDestination)
-#endif
         color.setAlpha(127); // porter-duff needs an alpha channel
     dest.fill(color);