diff options
Diffstat (limited to 'src/chartsqml2/chartsqml2_plugin.cpp')
| -rw-r--r-- | src/chartsqml2/chartsqml2_plugin.cpp | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/src/chartsqml2/chartsqml2_plugin.cpp b/src/chartsqml2/chartsqml2_plugin.cpp index c4a4ae71..6cf2f9cd 100644 --- a/src/chartsqml2/chartsqml2_plugin.cpp +++ b/src/chartsqml2/chartsqml2_plugin.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Charts module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Charts module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include <QtCharts/QChart> #include <QtCharts/QAbstractAxis> @@ -49,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> @@ -79,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) @@ -199,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"); @@ -263,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"); |