@@ -48,7 +48,9 QTEST_MAIN(tst_ChartDataSet) | |||||
48 | #include <qvalueaxis.h> |
|
48 | #include <qvalueaxis.h> | |
49 | #include <qbarcategoryaxis.h> |
|
49 | #include <qbarcategoryaxis.h> | |
50 | #include <qcategoryaxis.h> |
|
50 | #include <qcategoryaxis.h> | |
51 | #include <qdatetimeaxis.h> |
|
51 | #ifndef QT_ON_ARM | |
|
52 | #include "qdatetimeaxis.h" | |||
|
53 | #endif | |||
52 | #include <qlineseries.h> |
|
54 | #include <qlineseries.h> | |
53 | #include <qareaseries.h> |
|
55 | #include <qareaseries.h> | |
54 | #include <qscatterseries.h> |
|
56 | #include <qscatterseries.h> | |
@@ -219,12 +221,16 void tst_ChartDataSet::addAxis_data() | |||||
219 | QAbstractAxis* value = new QValueAxis(this); |
|
221 | QAbstractAxis* value = new QValueAxis(this); | |
220 | QAbstractAxis* category = new QCategoryAxis(this); |
|
222 | QAbstractAxis* category = new QCategoryAxis(this); | |
221 | QAbstractAxis* barcategory = new QBarCategoryAxis(this); |
|
223 | QAbstractAxis* barcategory = new QBarCategoryAxis(this); | |
|
224 | #ifndef Q_WS_QWS | |||
222 | QAbstractAxis* datetime = new QDateTimeAxis(this); |
|
225 | QAbstractAxis* datetime = new QDateTimeAxis(this); | |
|
226 | #endif | |||
223 |
|
227 | |||
224 | QTest::newRow("value") << value; |
|
228 | QTest::newRow("value") << value; | |
225 | QTest::newRow("category") << category; |
|
229 | QTest::newRow("category") << category; | |
226 | QTest::newRow("barcategory") << barcategory; |
|
230 | QTest::newRow("barcategory") << barcategory; | |
|
231 | #ifndef Q_WS_QWS | |||
227 | QTest::newRow("datetime") << datetime; |
|
232 | QTest::newRow("datetime") << datetime; | |
|
233 | #endif | |||
228 | } |
|
234 | } | |
229 |
|
235 | |||
230 | void tst_ChartDataSet::addAxis() |
|
236 | void tst_ChartDataSet::addAxis() | |
@@ -292,8 +298,9 void tst_ChartDataSet::attachAxis_data() | |||||
292 |
|
298 | |||
293 | QAbstractAxis* category = new QCategoryAxis(this); |
|
299 | QAbstractAxis* category = new QCategoryAxis(this); | |
294 | QAbstractAxis* barcategory = new QBarCategoryAxis(this); |
|
300 | QAbstractAxis* barcategory = new QBarCategoryAxis(this); | |
|
301 | #ifndef Q_WS_QWS | |||
295 | QAbstractAxis* datetime = new QDateTimeAxis(this); |
|
302 | QAbstractAxis* datetime = new QDateTimeAxis(this); | |
296 |
|
303 | #endif | ||
297 | { |
|
304 | { | |
298 | QList<QAbstractSeries*> series; |
|
305 | QList<QAbstractSeries*> series; | |
299 | QList<QAbstractAxis*> axes; |
|
306 | QList<QAbstractAxis*> axes; |
General Comments 0
You need to be logged in to leave comments.
Login now