##// 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,6 +42,10
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
@@ -120,7 +123,9 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");
General Comments 0
You need to be logged in to leave comments. Login now