diff options
Diffstat (limited to 'src/charts/qchartglobal.h')
| -rw-r--r-- | src/charts/qchartglobal.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/charts/qchartglobal.h b/src/charts/qchartglobal.h index 2f6e35a2..1c4a6686 100644 --- a/src/charts/qchartglobal.h +++ b/src/charts/qchartglobal.h @@ -1,34 +1,42 @@ -/****************************************************************************** +/**************************************************************************** ** -** 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 QCHARTGLOBAL_H #define QCHARTGLOBAL_H #include <QtCore/QtGlobal> -#define QT_CHARTS_VERSION_STR "2.1.1" +#define QT_CHARTS_VERSION_STR QT_VERSION_STR /* QT_CHARTS_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_CHARTS_VERSION 0x020101 +#define QT_CHARTS_VERSION QT_VERSION /* can be used like #if (QT_CHARTS_VERSION >= QT_CHARTS_VERSION_CHECK(1, 1, 0)) */ @@ -40,19 +48,11 @@ # define QT_CHARTS_EXPORT Q_DECL_IMPORT #endif -#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_CHARTS_LIBRARY) -# define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_EXPORT -#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_CHARTS_LIBRARY) -# define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_IMPORT -#else -# define QT_CHARTS_AUTOTEST_EXPORT -#endif - #ifdef QT_CHARTS_STATICLIB # undef QT_CHARTS_EXPORT -# undef QT_CHARTS_AUTOTEST_EXPORT +# undef Q_AUTOTEST_EXPORT # define QT_CHARTS_EXPORT -# define QT_CHARTS_AUTOTEST_EXPORT +# define Q_AUTOTEST_EXPORT #endif #define QT_CHARTS_NAMESPACE QtCharts |