##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Disabled QDateTimeAxis on ARM
Marek Rosa -
r1867:0e43261b5767
parent child
Show More
Side by Side Unified
Context file:
r1867:0e43261b5767 Loading diff...:
Show file before | Show file after | Hide comments
@@ -64,6 +64,10 mac: {
64 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
64 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
65 }
65 }
66
66
67 linux-arm*: {
68 DEFINES+=QT_ON_ARM
69 }
70
67 ##################### INCLUDES ############################################################
71 ##################### INCLUDES ############################################################
68
72
69
73
Show file before | Show file after | Hide comments
@@ -30,6 +30,10 SUBDIRS += \
30 donut \
30 donut \
31 donutbreakdown \
31 donutbreakdown \
32 scrollchart \
32 scrollchart \
33 datetimeaxis \
34 populationpyramid \
33 populationpyramid \
35 donutchart
34 donutchart
35
36 !linux-arm*: {
37 SUBDIRS += \
38 datetimeaxis
39 }
Show file before | Show file after | Hide comments
@@ -29,10 +29,13
29 #include "declarativescatterseries.h"
29 #include "declarativescatterseries.h"
30 #include "qbarcategoryaxis.h"
30 #include "qbarcategoryaxis.h"
31 #include "qvalueaxis.h"
31 #include "qvalueaxis.h"
32 #include "qdatetimeaxis.h"
33 #include "qcategoryaxis.h"
32 #include "qcategoryaxis.h"
34 #include "qabstractseries_p.h"
33 #include "qabstractseries_p.h"
35
34
35 #ifndef QT_ON_ARM
36 #include "qdatetimeaxis.h"
37 #endif
38
36 QTCOMMERCIALCHART_BEGIN_NAMESPACE
39 QTCOMMERCIALCHART_BEGIN_NAMESPACE
37
40
38 /*!
41 /*!
@@ -638,9 +641,11 void DeclarativeChart::createDefaultAxes(QAbstractSeries* series)
638 case QAbstractAxis::AxisTypeCategory:
641 case QAbstractAxis::AxisTypeCategory:
639 m_chart->setAxisX(new QCategoryAxis(this), series);
642 m_chart->setAxisX(new QCategoryAxis(this), series);
640 break;
643 break;
644 #ifndef QT_ON_ARM
641 case QAbstractAxis::AxisTypeDateTime:
645 case QAbstractAxis::AxisTypeDateTime:
642 m_chart->setAxisX(new QDateTimeAxis(this), series);
646 m_chart->setAxisX(new QDateTimeAxis(this), series);
643 break;
647 break;
648 #endif
644 default:
649 default:
645 // Do nothing, assume AxisTypeNoAxis
650 // Do nothing, assume AxisTypeNoAxis
646 break;
651 break;
@@ -659,9 +664,11 void DeclarativeChart::createDefaultAxes(QAbstractSeries* series)
659 case QAbstractAxis::AxisTypeCategory:
664 case QAbstractAxis::AxisTypeCategory:
660 m_chart->setAxisY(new QCategoryAxis(this), series);
665 m_chart->setAxisY(new QCategoryAxis(this), series);
661 break;
666 break;
667 #ifndef QT_ON_ARM
662 case QAbstractAxis::AxisTypeDateTime:
668 case QAbstractAxis::AxisTypeDateTime:
663 m_chart->setAxisY(new QDateTimeAxis(this), series);
669 m_chart->setAxisY(new QDateTimeAxis(this), series);
664 break;
670 break;
671 #endif
665 default:
672 default:
666 // Do nothing, assume AxisTypeNoAxis
673 // Do nothing, assume AxisTypeNoAxis
667 break;
674 break;
Show file before | Show file after | Hide comments
@@ -3,14 +3,12
3 INCLUDEPATH += $$PWD \
3 INCLUDEPATH += $$PWD \
4 $$PWD/valueaxis \
4 $$PWD/valueaxis \
5 $$PWD/barcategoryaxis \
5 $$PWD/barcategoryaxis \
6 $$PWD/categoryaxis \
6 $$PWD/categoryaxis
7 $$PWD/datetimeaxis
8
7
9 DEPENDPATH += $$PWD \
8 DEPENDPATH += $$PWD \
10 $$PWD/valueaxis \
9 $$PWD/valueaxis \
11 $$PWD/barcategoryaxis \
10 $$PWD/barcategoryaxis \
12 $$PWD/categoryaxis \
11 $$PWD/categoryaxis
13 $$PWD/datetimeaxis
14
12
15 SOURCES += \
13 SOURCES += \
16 $$PWD/chartaxis.cpp \
14 $$PWD/chartaxis.cpp \
@@ -23,10 +21,7 SOURCES += \
23 $$PWD/barcategoryaxis/qbarcategoryaxis.cpp \
21 $$PWD/barcategoryaxis/qbarcategoryaxis.cpp \
24 $$PWD/categoryaxis/chartcategoryaxisx.cpp \
22 $$PWD/categoryaxis/chartcategoryaxisx.cpp \
25 $$PWD/categoryaxis/chartcategoryaxisy.cpp \
23 $$PWD/categoryaxis/chartcategoryaxisy.cpp \
26 $$PWD/categoryaxis/qcategoryaxis.cpp \
24 $$PWD/categoryaxis/qcategoryaxis.cpp
27 $$PWD/datetimeaxis/chartdatetimeaxisx.cpp \
28 $$PWD/datetimeaxis/chartdatetimeaxisy.cpp \
29 $$PWD/datetimeaxis/qdatetimeaxis.cpp
30
25
31 PRIVATE_HEADERS += \
26 PRIVATE_HEADERS += \
32 $$PWD/chartaxis_p.h \
27 $$PWD/chartaxis_p.h \
@@ -39,14 +34,31 PRIVATE_HEADERS += \
39 $$PWD/barcategoryaxis/qbarcategoryaxis_p.h \
34 $$PWD/barcategoryaxis/qbarcategoryaxis_p.h \
40 $$PWD/categoryaxis/chartcategoryaxisx_p.h \
35 $$PWD/categoryaxis/chartcategoryaxisx_p.h \
41 $$PWD/categoryaxis/chartcategoryaxisy_p.h \
36 $$PWD/categoryaxis/chartcategoryaxisy_p.h \
42 $$PWD/categoryaxis/qcategoryaxis_p.h \
37 $$PWD/categoryaxis/qcategoryaxis_p.h
43 $$PWD/datetimeaxis/chartdatetimeaxisx_p.h \
44 $$PWD/datetimeaxis/chartdatetimeaxisy_p.h \
45 $$PWD/datetimeaxis/qdatetimeaxis_p.h
46
38
47 PUBLIC_HEADERS += \
39 PUBLIC_HEADERS += \
48 $$PWD/qabstractaxis.h \
40 $$PWD/qabstractaxis.h \
49 $$PWD/valueaxis/qvalueaxis.h \
41 $$PWD/valueaxis/qvalueaxis.h \
50 $$PWD/barcategoryaxis/qbarcategoryaxis.h \
42 $$PWD/barcategoryaxis/qbarcategoryaxis.h \
51 $$PWD/categoryaxis/qcategoryaxis.h \
43 $$PWD/categoryaxis/qcategoryaxis.h
44
45 !linux-arm*: {
46 INCLUDEPATH += \
47 $$PWD/datetimeaxis
48
49 DEPENDPATH += \
50 $$PWD/datetimeaxis
51
52 SOURCES += \
53 $$PWD/datetimeaxis/chartdatetimeaxisx.cpp \
54 $$PWD/datetimeaxis/chartdatetimeaxisy.cpp \
55 $$PWD/datetimeaxis/qdatetimeaxis.cpp
56
57 PRIVATE_HEADERS += \
58 $$PWD/datetimeaxis/chartdatetimeaxisx_p.h \
59 $$PWD/datetimeaxis/chartdatetimeaxisy_p.h \
60 $$PWD/datetimeaxis/qdatetimeaxis_p.h
61
62 PUBLIC_HEADERS += \
52 $$PWD/datetimeaxis/qdatetimeaxis.h
63 $$PWD/datetimeaxis/qdatetimeaxis.h
64 }
Show file before | Show file after | Hide comments
@@ -24,13 +24,16
24 #include "qbarcategoryaxis.h"
24 #include "qbarcategoryaxis.h"
25 #include "qvalueaxis_p.h"
25 #include "qvalueaxis_p.h"
26 #include "qcategoryaxis.h"
26 #include "qcategoryaxis.h"
27 #include "qdatetimeaxis.h"
28 #include "qabstractseries_p.h"
27 #include "qabstractseries_p.h"
29 #include "qabstractbarseries.h"
28 #include "qabstractbarseries.h"
30 #include "qstackedbarseries.h"
29 #include "qstackedbarseries.h"
31 #include "qpercentbarseries.h"
30 #include "qpercentbarseries.h"
32 #include "qpieseries.h"
31 #include "qpieseries.h"
33
32
33 #ifndef QT_ON_ARM
34 #include "qdatetimeaxis.h"
35 #endif
36
34 QTCOMMERCIALCHART_BEGIN_NAMESPACE
37 QTCOMMERCIALCHART_BEGIN_NAMESPACE
35
38
36 ChartDataSet::ChartDataSet(QChart *parent):QObject(parent)
39 ChartDataSet::ChartDataSet(QChart *parent):QObject(parent)
@@ -187,9 +190,11 QAbstractAxis* ChartDataSet::createAxis(QAbstractAxis::AxisType type, Qt::Orient
187 case QAbstractAxis::AxisTypeCategory:
190 case QAbstractAxis::AxisTypeCategory:
188 axis = new QCategoryAxis(this);
191 axis = new QCategoryAxis(this);
189 break;
192 break;
193 #ifndef Q_WS_QWS
190 case QAbstractAxis::AxisTypeDateTime:
194 case QAbstractAxis::AxisTypeDateTime:
191 axis = new QDateTimeAxis(this);
195 axis = new QDateTimeAxis(this);
192 break;
196 break;
197 #endif
193 default:
198 default:
194 axis = 0;
199 axis = 0;
195 break;
200 break;
Show file before | Show file after | Hide comments
@@ -22,9 +22,13 SUBDIRS += \
22 qhorizontalpercentbarseries \
22 qhorizontalpercentbarseries \
23 qvalueaxis \
23 qvalueaxis \
24 qcategoryaxis \
24 qcategoryaxis \
25 qdatetimeaxis \
26 qbarcategoryaxis
25 qbarcategoryaxis
27
26
27 !linux-arm*: {
28 SUBDIRS += \
29 qdatetimeaxis
30 }
31
28 test_private:{
32 test_private:{
29 SUBDIRS += domain chartdataset
33 SUBDIRS += domain chartdataset
30 }
34 }
General Comments 0
You need to be logged in to leave comments. Login now