From 273bae38cf4f9b0234839ce1a0443ce5ea4e1066 Mon Sep 17 00:00:00 2001 From: Mika Salmela Date: Tue, 14 Apr 2015 13:35:51 +0300 Subject: Copyright header changes Copyright header changes for 5.5. Change-Id: I0361cfe1ebdb28955cb927700f14cf7b72694421 Reviewed-by: Miikka Heikkinen --- src/datavisualization/global/datavisualizationglobal_p.h | 6 +++--- src/datavisualization/global/qdatavisualizationglobal.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/datavisualization/global') diff --git a/src/datavisualization/global/datavisualizationglobal_p.h b/src/datavisualization/global/datavisualizationglobal_p.h index 91c97ad8..ad5b95a7 100644 --- a/src/datavisualization/global/datavisualizationglobal_p.h +++ b/src/datavisualization/global/datavisualizationglobal_p.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 diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index 00281556..66e5f8f5 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 -- cgit v1.2.3 From 916d67d2664b0262cd03b28ad0c694924dd09b13 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 14 Apr 2015 13:39:06 +0300 Subject: Add dist file for 1.2.1 and change version numbers Change-Id: Ia6bd240a8737fe9dbb6bf2d019cb032c7b60a874 Reviewed-by: Mika Salmela --- src/datavisualization/global/qdatavisualizationglobal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/datavisualization/global') diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index 66e5f8f5..f22017f3 100644 --- a/src/datavisualization/global/qdatavisualizationglobal.h +++ b/src/datavisualization/global/qdatavisualizationglobal.h @@ -21,11 +21,11 @@ #include -#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)) */ -- cgit v1.2.3