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

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

QDateTimeAxis: qml on arm not registering the type anymore
Marek Rosa -
r1942:4c816e44c2e0
parent child
Show More
Side by Side Unified
Context file:
r1942:4c816e44c2e0 Loading diff...:
Show file before | Show file after | Hide comments
@@ -23,7 +23,6
23 #include "qchart.h"
23 #include "qchart.h"
24 #include "qabstractaxis.h"
24 #include "qabstractaxis.h"
25 #include "qvalueaxis.h"
25 #include "qvalueaxis.h"
26 #include "qdatetimeaxis.h"
27 #include "declarativecategoryaxis.h"
26 #include "declarativecategoryaxis.h"
28 #include "qbarcategoryaxis.h"
27 #include "qbarcategoryaxis.h"
29 #include "declarativechart.h"
28 #include "declarativechart.h"
@@ -43,12 +42,16
43 #include "declarativemargins.h"
42 #include "declarativemargins.h"
44 #include <QAbstractItemModel>
43 #include <QAbstractItemModel>
45
44
45 #ifndef QT_ON_ARM
46 #include "qdatetimeaxis.h"
47 #endif
48
46 QTCOMMERCIALCHART_BEGIN_NAMESPACE
49 QTCOMMERCIALCHART_BEGIN_NAMESPACE
47
50
48 class ChartQmlPlugin : public QDeclarativeExtensionPlugin
51 class ChartQmlPlugin : public QDeclarativeExtensionPlugin
49 {
52 {
50 Q_OBJECT
53 Q_OBJECT
51 public:
54 public:
52 virtual void registerTypes(const char *uri)
55 virtual void registerTypes(const char *uri)
53 {
56 {
54 Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart"));
57 Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart"));
@@ -75,27 +78,27 public:
75 qmlRegisterType<QValueAxis>(uri, 1, 0, "ValuesAxis");
78 qmlRegisterType<QValueAxis>(uri, 1, 0, "ValuesAxis");
76 qmlRegisterType<QBarCategoryAxis>(uri, 1, 0, "BarCategoriesAxis");
79 qmlRegisterType<QBarCategoryAxis>(uri, 1, 0, "BarCategoriesAxis");
77 qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend",
80 qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend",
78 QLatin1String("Trying to create uncreatable: Legend."));
81 QLatin1String("Trying to create uncreatable: Legend."));
79 qmlRegisterUncreatableType<QXYSeries>(uri, 1, 0, "XYSeries",
82 qmlRegisterUncreatableType<QXYSeries>(uri, 1, 0, "XYSeries",
80 QLatin1String("Trying to create uncreatable: XYSeries."));
83 QLatin1String("Trying to create uncreatable: XYSeries."));
81 qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
84 qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
82 QLatin1String("Trying to create uncreatable: AbstractItemModel."));
85 QLatin1String("Trying to create uncreatable: AbstractItemModel."));
83 qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
86 qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
84 QLatin1String("Trying to create uncreatable: XYModelMapper."));
87 QLatin1String("Trying to create uncreatable: XYModelMapper."));
85 qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
88 qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
86 QLatin1String("Trying to create uncreatable: PieModelMapper."));
89 QLatin1String("Trying to create uncreatable: PieModelMapper."));
87 qmlRegisterUncreatableType<QBarModelMapper>(uri, 1, 0, "BarModelMapper",
90 qmlRegisterUncreatableType<QBarModelMapper>(uri, 1, 0, "BarModelMapper",
88 QLatin1String("Trying to create uncreatable: BarModelMapper."));
91 QLatin1String("Trying to create uncreatable: BarModelMapper."));
89 qmlRegisterUncreatableType<QAbstractSeries>(uri, 1, 0, "AbstractSeries",
92 qmlRegisterUncreatableType<QAbstractSeries>(uri, 1, 0, "AbstractSeries",
90 QLatin1String("Trying to create uncreatable: AbstractSeries."));
93 QLatin1String("Trying to create uncreatable: AbstractSeries."));
91 qmlRegisterUncreatableType<QAbstractBarSeries>(uri, 1, 0, "AbstractBarSeries",
94 qmlRegisterUncreatableType<QAbstractBarSeries>(uri, 1, 0, "AbstractBarSeries",
92 QLatin1String("Trying to create uncreatable: AbstractBarSeries."));
95 QLatin1String("Trying to create uncreatable: AbstractBarSeries."));
93 qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 0, "AbstractAxis",
96 qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 0, "AbstractAxis",
94 QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead."));
97 QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead."));
95 qmlRegisterUncreatableType<QBarSet>(uri, 1, 0, "BarSetBase",
98 qmlRegisterUncreatableType<QBarSet>(uri, 1, 0, "BarSetBase",
96 QLatin1String("Trying to create uncreatable: BarsetBase."));
99 QLatin1String("Trying to create uncreatable: BarsetBase."));
97 qmlRegisterUncreatableType<QPieSeries>(uri, 1, 0, "QPieSeries",
100 qmlRegisterUncreatableType<QPieSeries>(uri, 1, 0, "QPieSeries",
98 QLatin1String("Trying to create uncreatable: QPieSeries. Use PieSeries instead."));
101 QLatin1String("Trying to create uncreatable: QPieSeries. Use PieSeries instead."));
99
102
100 // QtCommercial.Chart 1.1
103 // QtCommercial.Chart 1.1
101 qmlRegisterType<DeclarativeChart, 1>(uri, 1, 1, "ChartView");
104 qmlRegisterType<DeclarativeChart, 1>(uri, 1, 1, "ChartView");
@@ -120,34 +123,36 public:
120 qmlRegisterType<QHBarModelMapper>(uri, 1, 1, "HBarModelMapper");
123 qmlRegisterType<QHBarModelMapper>(uri, 1, 1, "HBarModelMapper");
121 qmlRegisterType<QVBarModelMapper>(uri, 1, 1, "VBarModelMapper");
124 qmlRegisterType<QVBarModelMapper>(uri, 1, 1, "VBarModelMapper");
122 qmlRegisterType<QValueAxis>(uri, 1, 1, "ValueAxis");
125 qmlRegisterType<QValueAxis>(uri, 1, 1, "ValueAxis");
126 #ifndef QT_ON_ARM
123 qmlRegisterType<QDateTimeAxis>(uri, 1, 1, "DateTimeAxis");
127 qmlRegisterType<QDateTimeAxis>(uri, 1, 1, "DateTimeAxis");
128 #endif
124 qmlRegisterType<DeclarativeCategoryAxis>(uri, 1, 1, "CategoryAxis");
129 qmlRegisterType<DeclarativeCategoryAxis>(uri, 1, 1, "CategoryAxis");
125 qmlRegisterType<DeclarativeCategoryRange>(uri, 1, 1, "CategoryRange");
130 qmlRegisterType<DeclarativeCategoryRange>(uri, 1, 1, "CategoryRange");
126 qmlRegisterType<QBarCategoryAxis>(uri, 1, 1, "BarCategoryAxis");
131 qmlRegisterType<QBarCategoryAxis>(uri, 1, 1, "BarCategoryAxis");
127 qmlRegisterUncreatableType<QLegend>(uri, 1, 1, "Legend",
132 qmlRegisterUncreatableType<QLegend>(uri, 1, 1, "Legend",
128 QLatin1String("Trying to create uncreatable: Legend."));
133 QLatin1String("Trying to create uncreatable: Legend."));
129 qmlRegisterUncreatableType<QXYSeries>(uri, 1, 1, "XYSeries",
134 qmlRegisterUncreatableType<QXYSeries>(uri, 1, 1, "XYSeries",
130 QLatin1String("Trying to create uncreatable: XYSeries."));
135 QLatin1String("Trying to create uncreatable: XYSeries."));
131 qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 1, "AbstractItemModel",
136 qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 1, "AbstractItemModel",
132 QLatin1String("Trying to create uncreatable: AbstractItemModel."));
137 QLatin1String("Trying to create uncreatable: AbstractItemModel."));
133 qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 1, "XYModelMapper",
138 qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 1, "XYModelMapper",
134 QLatin1String("Trying to create uncreatable: XYModelMapper."));
139 QLatin1String("Trying to create uncreatable: XYModelMapper."));
135 qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 1, "PieModelMapper",
140 qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 1, "PieModelMapper",
136 QLatin1String("Trying to create uncreatable: PieModelMapper."));
141 QLatin1String("Trying to create uncreatable: PieModelMapper."));
137 qmlRegisterUncreatableType<QBarModelMapper>(uri, 1, 1, "BarModelMapper",
142 qmlRegisterUncreatableType<QBarModelMapper>(uri, 1, 1, "BarModelMapper",
138 QLatin1String("Trying to create uncreatable: BarModelMapper."));
143 QLatin1String("Trying to create uncreatable: BarModelMapper."));
139 qmlRegisterUncreatableType<QAbstractSeries>(uri, 1, 1, "AbstractSeries",
144 qmlRegisterUncreatableType<QAbstractSeries>(uri, 1, 1, "AbstractSeries",
140 QLatin1String("Trying to create uncreatable: AbstractSeries."));
145 QLatin1String("Trying to create uncreatable: AbstractSeries."));
141 qmlRegisterUncreatableType<QAbstractBarSeries>(uri, 1, 1, "AbstractBarSeries",
146 qmlRegisterUncreatableType<QAbstractBarSeries>(uri, 1, 1, "AbstractBarSeries",
142 QLatin1String("Trying to create uncreatable: AbstractBarSeries."));
147 QLatin1String("Trying to create uncreatable: AbstractBarSeries."));
143 qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 1, "AbstractAxis",
148 qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 1, "AbstractAxis",
144 QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead."));
149 QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead."));
145 qmlRegisterUncreatableType<QBarSet>(uri, 1, 1, "BarSetBase",
150 qmlRegisterUncreatableType<QBarSet>(uri, 1, 1, "BarSetBase",
146 QLatin1String("Trying to create uncreatable: BarsetBase."));
151 QLatin1String("Trying to create uncreatable: BarsetBase."));
147 qmlRegisterUncreatableType<QPieSeries>(uri, 1, 1, "QPieSeries",
152 qmlRegisterUncreatableType<QPieSeries>(uri, 1, 1, "QPieSeries",
148 QLatin1String("Trying to create uncreatable: QPieSeries. Use PieSeries instead."));
153 QLatin1String("Trying to create uncreatable: QPieSeries. Use PieSeries instead."));
149 qmlRegisterUncreatableType<DeclarativeMargins>(uri, 1, 1, "Margins",
154 qmlRegisterUncreatableType<DeclarativeMargins>(uri, 1, 1, "Margins",
150 QLatin1String("Trying to create uncreatable: Margins."));
155 QLatin1String("Trying to create uncreatable: Margins."));
151 }
156 }
152 };
157 };
153
158
General Comments 0
You need to be logged in to leave comments. Login now