summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/qobject
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-04-16 09:59:31 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-04-16 09:59:31 (GMT)
commit2412e3c0fedb4eba5fecffb23c3b9a31ad803ea0 (patch)
tree4d48ece1b8ad6b5eca854d05f00eea82733af389 /tests/benchmarks/qobject
parente37684d2899b8f2cbc14fa0ab19ab12ed23d495a (diff)
downloadQt-2412e3c0fedb4eba5fecffb23c3b9a31ad803ea0.zip
Qt-2412e3c0fedb4eba5fecffb23c3b9a31ad803ea0.tar.gz
Qt-2412e3c0fedb4eba5fecffb23c3b9a31ad803ea0.tar.bz2
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
Diffstat (limited to 'tests/benchmarks/qobject')
-rw-r--r--tests/benchmarks/qobject/main.cpp14
1 files changed, 2 insertions, 12 deletions
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()));