summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/charts/charts.pro2
-rw-r--r--src/charts/axis/axis.pri2
-rw-r--r--src/charts/axis/datetimeaxis/qdatetimeaxis.cpp2
-rw-r--r--src/charts/chartdataset.cpp4
-rw-r--r--src/charts/charts.pro2
-rw-r--r--src/chartsqml2/chartsqml2.pro1
-rw-r--r--src/chartsqml2/chartsqml2_plugin.cpp10
-rw-r--r--src/chartsqml2/declarativechart.cpp4
-rw-r--r--tests/auto/auto.pro2
-rw-r--r--tests/auto/chartdataset/chartdataset.pro1
-rw-r--r--tests/auto/chartdataset/tst_chartdataset.cpp6
-rw-r--r--tests/auto/qml/qml.pro1
-rw-r--r--tests/auto/qml/tst_qml.cpp4
-rw-r--r--tests/manual/chartviewer/charts/charts.pri2
14 files changed, 25 insertions, 18 deletions
diff --git a/examples/charts/charts.pro b/examples/charts/charts.pro
index 3f463e46..5caa03c6 100644
--- a/examples/charts/charts.pro
+++ b/examples/charts/charts.pro
@@ -59,7 +59,7 @@ contains(QT_CONFIG, opengl) {
message("OpenGL not available. Some examples are disabled.")
}
-!linux-arm*: {
+!contains(QT_COORD_TYPE, float): {
SUBDIRS += \
datetimeaxis
}
diff --git a/src/charts/axis/axis.pri b/src/charts/axis/axis.pri
index 6f706aac..445782cd 100644
--- a/src/charts/axis/axis.pri
+++ b/src/charts/axis/axis.pri
@@ -81,7 +81,7 @@ PRIVATE_HEADERS += \
$$PWD/categoryaxis/polarchartcategoryaxisangular_p.h \
$$PWD/categoryaxis/polarchartcategoryaxisradial_p.h
-!linux-arm*: {
+!contains(QT_COORD_TYPE, float): {
INCLUDEPATH += \
$$PWD/datetimeaxis
diff --git a/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp b/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp
index ad7fbff9..00c43042 100644
--- a/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp
+++ b/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp
@@ -49,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE
There are also other limitiation related to QDateTime. Please refer to QDateTime documentation.
QDateTimeAxis can be setup to show axis line with tick marks, grid lines and shades.
- Note: QDateTimeAxis is disabled on ARM architecture.
+ Note: QDateTimeAxis is disabled on platforms that define qreal as float.
\image api_datatime_axis.png
diff --git a/src/charts/chartdataset.cpp b/src/charts/chartdataset.cpp
index 10a46fed..33857b0d 100644
--- a/src/charts/chartdataset.cpp
+++ b/src/charts/chartdataset.cpp
@@ -51,7 +51,7 @@
#include <private/logxlogypolardomain_p.h>
#include <private/glxyseriesdata_p.h>
-#ifndef QT_ON_ARM
+#ifndef QT_QREAL_IS_FLOAT
#include <QtCharts/QDateTimeAxis>
#endif
@@ -361,7 +361,7 @@ void ChartDataSet::createAxes(QAbstractAxis::AxisTypes type, Qt::Orientation ori
case QAbstractAxis::AxisTypeCategory:
axis = new QCategoryAxis(this);
break;
-#ifndef Q_WS_QWS
+#ifndef QT_QREAL_IS_FLOAT
case QAbstractAxis::AxisTypeDateTime:
axis = new QDateTimeAxis(this);
break;
diff --git a/src/charts/charts.pro b/src/charts/charts.pro
index 427432b8..30546fd0 100644
--- a/src/charts/charts.pro
+++ b/src/charts/charts.pro
@@ -5,6 +5,8 @@ TARGET = QtCharts
message($$QT_CONFIG)
QT = core gui widgets
DEFINES += QT_CHARTS_LIBRARY
+contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT
+
# Fix exports in static builds for applications linking charts module
static: MODULE_DEFINES += QT_CHARTS_STATICLIB
diff --git a/src/chartsqml2/chartsqml2.pro b/src/chartsqml2/chartsqml2.pro
index 5df01942..fae7dc26 100644
--- a/src/chartsqml2/chartsqml2.pro
+++ b/src/chartsqml2/chartsqml2.pro
@@ -3,6 +3,7 @@ TARGET = qtchartsqml2
QT += qml quick
QT += charts charts-private
TARGETPATH = QtCharts
+contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT
IMPORT_VERSION = $$MODULE_VERSION
diff --git a/src/chartsqml2/chartsqml2_plugin.cpp b/src/chartsqml2/chartsqml2_plugin.cpp
index 67eebd8a..6cf2f9cd 100644
--- a/src/chartsqml2/chartsqml2_plugin.cpp
+++ b/src/chartsqml2/chartsqml2_plugin.cpp
@@ -57,7 +57,7 @@
#include <QtCharts/QXYLegendMarker>
#include <QtCharts/QBoxPlotModelMapper>
#include <QtCharts/QVBoxPlotModelMapper>
-#ifndef QT_ON_ARM
+#ifndef QT_QREAL_IS_FLOAT
#include <QtCharts/QDateTimeAxis>
#endif
#include <QtCore/QAbstractItemModel>
@@ -87,7 +87,9 @@ QML_DECLARE_TYPE(QAbstractAxis)
QML_DECLARE_TYPE(QValueAxis)
QML_DECLARE_TYPE(QBarCategoryAxis)
QML_DECLARE_TYPE(QCategoryAxis)
-QML_DECLARE_TYPE(QDateTimeAxis)
+#ifndef QT_QREAL_IS_FLOAT
+ QML_DECLARE_TYPE(QDateTimeAxis)
+#endif
QML_DECLARE_TYPE(QLogValueAxis)
QML_DECLARE_TYPE(QLegend)
@@ -207,7 +209,7 @@ public:
qmlRegisterType<DeclarativePieSeries>(uri, 1, 1, "PieSeries");
qmlRegisterType<DeclarativeBarSet>(uri, 1, 1, "BarSet");
qmlRegisterType<QValueAxis>(uri, 1, 1, "ValueAxis");
-#ifndef QT_ON_ARM
+#ifndef QT_QREAL_IS_FLOAT
qmlRegisterType<QDateTimeAxis>(uri, 1, 1, "DateTimeAxis");
#endif
qmlRegisterType<DeclarativeCategoryAxis>(uri, 1, 1, "CategoryAxis");
@@ -271,7 +273,7 @@ public:
qmlRegisterType<QHBarModelMapper>(uri, 2, 0, "HBarModelMapper");
qmlRegisterType<QVBarModelMapper>(uri, 2, 0, "VBarModelMapper");
qmlRegisterType<QValueAxis>(uri, 2, 0, "ValueAxis");
-#ifndef QT_ON_ARM
+#ifndef QT_QREAL_IS_FLOAT
qmlRegisterType<QDateTimeAxis>(uri, 2, 0, "DateTimeAxis");
#endif
qmlRegisterType<DeclarativeCategoryAxis>(uri, 2, 0, "CategoryAxis");
diff --git a/src/chartsqml2/declarativechart.cpp b/src/chartsqml2/declarativechart.cpp
index 25fb16c9..3362daf2 100644
--- a/src/chartsqml2/declarativechart.cpp
+++ b/src/chartsqml2/declarativechart.cpp
@@ -50,7 +50,7 @@
#include <private/chartpresenter_p.h>
#include <QtCharts/QPolarChart>
-#ifndef QT_ON_ARM
+#ifndef QT_QREAL_IS_FLOAT
#include <QtCharts/QDateTimeAxis>
#endif
@@ -1149,7 +1149,7 @@ QAbstractAxis *DeclarativeChart::defaultAxis(Qt::Orientation orientation, QAbstr
return new QBarCategoryAxis(this);
case QAbstractAxis::AxisTypeCategory:
return new QCategoryAxis(this);
-#ifndef QT_ON_ARM
+#ifndef QT_QREAL_IS_FLOAT
case QAbstractAxis::AxisTypeDateTime:
return new QDateTimeAxis(this);
#endif
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 7ed84cbf..e8cad75c 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -25,7 +25,7 @@ SUBDIRS += \
qlegend \
cmake
-!linux-arm*: {
+!contains(QT_COORD_TYPE, float): {
SUBDIRS += \
qdatetimeaxis
}
diff --git a/tests/auto/chartdataset/chartdataset.pro b/tests/auto/chartdataset/chartdataset.pro
index 994532ae..754f3e9b 100644
--- a/tests/auto/chartdataset/chartdataset.pro
+++ b/tests/auto/chartdataset/chartdataset.pro
@@ -3,5 +3,6 @@
}
QT += charts-private
+contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT
SOURCES += tst_chartdataset.cpp
diff --git a/tests/auto/chartdataset/tst_chartdataset.cpp b/tests/auto/chartdataset/tst_chartdataset.cpp
index 12652d69..fc1ac1d3 100644
--- a/tests/auto/chartdataset/tst_chartdataset.cpp
+++ b/tests/auto/chartdataset/tst_chartdataset.cpp
@@ -32,7 +32,7 @@
#include <QtCharts/QValueAxis>
#include <QtCharts/QBarCategoryAxis>
#include <QtCharts/QCategoryAxis>
-#ifndef QT_ON_ARM
+#ifndef QT_QREAL_IS_FLOAT
#include <QtCharts/QDateTimeAxis>
#endif
#include <QtCharts/QLineSeries>
@@ -208,14 +208,14 @@ void tst_ChartDataSet::addAxis_data()
QAbstractAxis* value = new QValueAxis(this);
QAbstractAxis* category = new QCategoryAxis(this);
QAbstractAxis* barcategory = new QBarCategoryAxis(this);
-#ifndef Q_WS_QWS
+#ifndef QT_QREAL_IS_FLOAT
QAbstractAxis* datetime = new QDateTimeAxis(this);
#endif
QTest::newRow("value") << value;
QTest::newRow("category") << category;
QTest::newRow("barcategory") << barcategory;
-#ifndef Q_WS_QWS
+#ifndef QT_QREAL_IS_FLOAT
QTest::newRow("datetime") << datetime;
#endif
}
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index f116195d..c7b808de 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -3,3 +3,4 @@
}
SOURCES += tst_qml.cpp
QT += qml quick
+contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT
diff --git a/tests/auto/qml/tst_qml.cpp b/tests/auto/qml/tst_qml.cpp
index fcbef8ca..b397f3d8 100644
--- a/tests/auto/qml/tst_qml.cpp
+++ b/tests/auto/qml/tst_qml.cpp
@@ -140,7 +140,7 @@ void tst_qml::checkPlugin_data()
QTest::newRow("HBarModelMapper") << imports_1_1() + "HBarModelMapper{}";
QTest::newRow("VBarModelMapper") << imports_1_1() + "VBarModelMapper{}";
QTest::newRow("ValueAxis") << imports_1_1() + "ValueAxis{}";
-#ifndef QT_ON_ARM
+#ifndef QT_QREAL_IS_FLOAT
QTest::newRow("DateTimeAxis") << imports_1_1() + "DateTimeAxis{}";
#endif
QTest::newRow("CategoryAxis") << imports_1_1() + "CategoryAxis{}";
@@ -176,7 +176,7 @@ void tst_qml::checkPlugin_data()
QTest::newRow("HBarModelMapper_2_0") << imports_2_0() + "HBarModelMapper{}";
QTest::newRow("VBarModelMapper_2_0") << imports_2_0() + "VBarModelMapper{}";
QTest::newRow("ValueAxis_2_0") << imports_2_0() + "ValueAxis{}";
-#ifndef QT_ON_ARM
+#ifndef QT_QREAL_IS_FLOAT
QTest::newRow("DateTimeAxis_2_0") << imports_2_0() + "DateTimeAxis{}";
#endif
QTest::newRow("CategoryAxis_2_0") << imports_2_0() + "CategoryAxis{}";
diff --git a/tests/manual/chartviewer/charts/charts.pri b/tests/manual/chartviewer/charts/charts.pri
index 5bef427f..17e3d4e9 100644
--- a/tests/manual/chartviewer/charts/charts.pri
+++ b/tests/manual/chartviewer/charts/charts.pri
@@ -44,7 +44,7 @@ SOURCES += \
$$PWD/domain/scatterlogxy.cpp \
$$PWD/domain/scatterxlogy.cpp
-!linux-arm*: {
+!contains(QT_COORD_TYPE, float): {
SOURCES += \
$$PWD/axis/datetimeaxisx.cpp \
$$PWD/axis/datetimeaxisy.cpp
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 08:43:06 +0000