HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2861:21c113d296ef

examples/charts/charts.pro +1 -1

                 message("OpenGL not available. Some examples are disabled.")
             }
-            !linux-arm*: {
+            !contains(QT_COORD_TYPE, float): {
             SUBDIRS += \
                 datetimeaxis
             }

src/charts/axis/axis.pri +1 -1

                 $$PWD/categoryaxis/polarchartcategoryaxisangular_p.h \
                 $$PWD/categoryaxis/polarchartcategoryaxisradial_p.h
-            !linux-arm*: {
+            !contains(QT_COORD_TYPE, float): {
             INCLUDEPATH += \
                 $$PWD/datetimeaxis

src/charts/axis/datetimeaxis/qdatetimeaxis.cpp +1 -1

                 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

src/charts/chartdataset.cpp +2 -2

             #include <private/logxlogypolardomain_p.h>
             #include <private/glxyseriesdata_p.h>
-            #ifndef QT_ON_ARM
+            #ifndef QT_QREAL_IS_FLOAT
             #include <QtCharts/QDateTimeAxis>
             #endif
                     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;

src/charts/charts.pro +2 0

             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

src/chartsqml2/chartsqml2.pro +1 0

             QT += qml quick
             QT += charts charts-private
             TARGETPATH = QtCharts
+            contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT
             IMPORT_VERSION = $$MODULE_VERSION

src/chartsqml2/chartsqml2_plugin.cpp +6 -4

             #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>
             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)
                     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");
                     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");

src/chartsqml2/declarativechart.cpp +2 -2

             #include <private/chartpresenter_p.h>
             #include <QtCharts/QPolarChart>
-            #ifndef QT_ON_ARM
+            #ifndef QT_QREAL_IS_FLOAT
                 #include <QtCharts/QDateTimeAxis>
             #endif
                     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

tests/auto/auto.pro +1 -1

                        qlegend \
                        cmake
-            !linux-arm*: {
+            !contains(QT_COORD_TYPE, float): {
                 SUBDIRS += \
                        qdatetimeaxis
             }

tests/auto/chartdataset/chartdataset.pro +1 0

             }
             QT += charts-private
+            contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT
             SOURCES += tst_chartdataset.cpp

tests/auto/chartdataset/tst_chartdataset.cpp +3 -3

             #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>
                 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
             }

tests/auto/qml/qml.pro +1 0

             }
             SOURCES += tst_qml.cpp
             QT += qml quick
+            contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT

tests/auto/qml/tst_qml.cpp +2 -2

                 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{}";
                 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{}";

tests/manual/chartviewer/charts/charts.pri +1 -1

                 $$PWD/domain/scatterlogxy.cpp \
                 $$PWD/domain/scatterxlogy.cpp
-            !linux-arm*: {
+            !contains(QT_COORD_TYPE, float): {
             SOURCES += \
                 $$PWD/axis/datetimeaxisx.cpp \
                 $$PWD/axis/datetimeaxisy.cpp

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages