diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-04-14 14:23:20 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-04-14 14:26:46 +0300 |
| commit | 5ba7f70d0d94de720d49b37b2d257b51b9afd026 (patch) | |
| tree | 19f8f355a85a913a194cf610731ceebd8d8fb643 /src/datavisualization/global/qdatavisualizationglobal.h | |
| parent | 62f90e25eec23cfac83985993f355feeac5b9f2c (diff) | |
| parent | 916d67d2664b0262cd03b28ad0c694924dd09b13 (diff) | |
Merge branch 'develop'v1.2.1
Change-Id: I58fa595eee1cf9ab934cb3187981355d6a856d05
Diffstat (limited to 'src/datavisualization/global/qdatavisualizationglobal.h')
| -rw-r--r-- | src/datavisualization/global/qdatavisualizationglobal.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index 00281556..f22017f3 100644 --- a/src/datavisualization/global/qdatavisualizationglobal.h +++ b/src/datavisualization/global/qdatavisualizationglobal.h @@ -1,15 +1,15 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc +** Copyright (C) 2015 The Qt Company Ltd ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.io +** For any questions to The Qt Company, please use contact form at http://qt.io ** ** This file is part of the Qt Data Visualization module. ** ** Licensees holding valid commercial license for Qt may use this file in ** accordance with the Qt License Agreement provided with the Software ** or, alternatively, in accordance with the terms contained in a written -** agreement between you and Digia. +** agreement between you and The Qt Company. ** ** If you have questions regarding the use of this file, please use ** contact form at http://qt.io @@ -21,11 +21,11 @@ #include <QtCore/qglobal.h> -#define QT_DATAVISUALIZATION_VERSION_STR "1.2.0" +#define QT_DATAVISUALIZATION_VERSION_STR "1.2.1" /* QT_DATAVISUALIZATION_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_DATAVISUALIZATION_VERSION 0x010200 +#define QT_DATAVISUALIZATION_VERSION 0x010201 /* can be used like #if (QT_DATAVISUALIZATION_VERSION >= QT_DATAVISUALIZATION_VERSION_CHECK(1, 0, 0)) */ |