1 files changed, 20 insertions, 34 deletions
diff --git a/tests/auto/chartdataset/tst_chartdataset.cpp b/tests/auto/chartdataset/tst_chartdataset.cpp
index 60abd45a..fc1ac1d3 100644
--- a/tests/auto/chartdataset/tst_chartdataset.cpp
+++ b/tests/auto/chartdataset/tst_chartdataset.cpp
@@ -1,51 +1,38 @@
-/******************************************************************************
+/****************************************************************************
 **
-** 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$
 **
-******************************************************************************/
-#ifndef BUILD_PRIVATE_UNIT_TESTS
-#include <QtTest/QtTest>
-
-class tst_ChartDataSet: public QObject {
-
-    Q_OBJECT
-
-private Q_SLOTS:
-    void skip();
-
-};
-
-void tst_ChartDataSet::skip()
-{
-    QSKIP("This test requires the debug version of library");
-}
-
-QTEST_MAIN(tst_ChartDataSet)
-#include "tst_chartdataset.moc"
-
-#else
+****************************************************************************/
 
 #include <QtTest/QtTest>
 #include <QtCharts/QAbstractAxis>
 #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>
@@ -221,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
 }
@@ -396,4 +383,3 @@ void tst_ChartDataSet::detachAxis()
 
 QTEST_MAIN(tst_ChartDataSet)
 #include "tst_chartdataset.moc"
-#endif