Merge branch 'develop'v1.2.1

Change-Id: I58fa595eee1cf9ab934cb3187981355d6a856d05

14 files changed, 38 insertions, 38 deletions

diff --git a/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
index 618709f7..461c3907 100644
--- a/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
+++ b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of QtDataVisualization.
diff --git a/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h
index 92ee5728..1b4f58fb 100644
--- a/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h
+++ b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h
@@ -1,6 +1,6 @@
 /***************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of QtDataVisualization.
diff --git a/tests/spectrum/spectrumapp/engine.cpp b/tests/spectrum/spectrumapp/engine.cpp
index 10a85966..620d3497 100644
--- a/tests/spectrum/spectrumapp/engine.cpp
+++ b/tests/spectrum/spectrumapp/engine.cpp
@@ -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/tests/spectrum/spectrumapp/engine.h b/tests/spectrum/spectrumapp/engine.h
index 85cc3412..6fc7a384 100644
--- a/tests/spectrum/spectrumapp/engine.h
+++ b/tests/spectrum/spectrumapp/engine.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/tests/spectrum/spectrumapp/frequencyspectrum.cpp b/tests/spectrum/spectrumapp/frequencyspectrum.cpp
index a4d7cbf9..bbe3ea20 100644
--- a/tests/spectrum/spectrumapp/frequencyspectrum.cpp
+++ b/tests/spectrum/spectrumapp/frequencyspectrum.cpp
@@ -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/tests/spectrum/spectrumapp/frequencyspectrum.h b/tests/spectrum/spectrumapp/frequencyspectrum.h
index 7d7d88c4..237533b3 100644
--- a/tests/spectrum/spectrumapp/frequencyspectrum.h
+++ b/tests/spectrum/spectrumapp/frequencyspectrum.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/tests/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp
index 06cdd506..e019d411 100644
--- a/tests/spectrum/spectrumapp/main.cpp
+++ b/tests/spectrum/spectrumapp/main.cpp
@@ -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/tests/spectrum/spectrumapp/spectrum.h b/tests/spectrum/spectrumapp/spectrum.h
index cf32e71e..259ab641 100644
--- a/tests/spectrum/spectrumapp/spectrum.h
+++ b/tests/spectrum/spectrumapp/spectrum.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/tests/spectrum/spectrumapp/spectrumanalyser.cpp b/tests/spectrum/spectrumapp/spectrumanalyser.cpp
index d05f4432..b33ce6f3 100644
--- a/tests/spectrum/spectrumapp/spectrumanalyser.cpp
+++ b/tests/spectrum/spectrumapp/spectrumanalyser.cpp
@@ -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/tests/spectrum/spectrumapp/spectrumanalyser.h b/tests/spectrum/spectrumapp/spectrumanalyser.h
index 355d1f6d..f24e44a7 100644
--- a/tests/spectrum/spectrumapp/spectrumanalyser.h
+++ b/tests/spectrum/spectrumapp/spectrumanalyser.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/tests/spectrum/spectrumapp/utils.cpp b/tests/spectrum/spectrumapp/utils.cpp
index 5b744250..067d778c 100644
--- a/tests/spectrum/spectrumapp/utils.cpp
+++ b/tests/spectrum/spectrumapp/utils.cpp
@@ -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/tests/spectrum/spectrumapp/utils.h b/tests/spectrum/spectrumapp/utils.h
index 43a55b75..b5d91ab7 100644
--- a/tests/spectrum/spectrumapp/utils.h
+++ b/tests/spectrum/spectrumapp/utils.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/tests/spectrum/spectrumapp/wavfile.cpp b/tests/spectrum/spectrumapp/wavfile.cpp
index 56c48fbb..0360ceb9 100644
--- a/tests/spectrum/spectrumapp/wavfile.cpp
+++ b/tests/spectrum/spectrumapp/wavfile.cpp
@@ -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/tests/spectrum/spectrumapp/wavfile.h b/tests/spectrum/spectrumapp/wavfile.h
index f14bc769..a1852195 100644
--- a/tests/spectrum/spectrumapp/wavfile.h
+++ b/tests/spectrum/spectrumapp/wavfile.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