From 197a8f828a1f012c5f27df8297b15574c119d4d1 2014-11-14 07:02:38 From: Titta Heikkala Date: 2014-11-14 07:02:38 Subject: [PATCH] Update license headers Updated new license headers to files that weren't yet updated. Change-Id: I193f5e46e019b5f82f0a333ee5d883fa193c2b20 Reviewed-by: Miikka Heikkinen --- diff --git a/plugins/designer/qchartsplugin.cpp b/plugins/designer/qchartsplugin.cpp index dd5b5ea..44925fc 100644 --- a/plugins/designer/qchartsplugin.cpp +++ b/plugins/designer/qchartsplugin.cpp @@ -2,19 +2,17 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** 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. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ diff --git a/plugins/designer/qchartsplugin.h b/plugins/designer/qchartsplugin.h index d79b358..b925eec 100644 --- a/plugins/designer/qchartsplugin.h +++ b/plugins/designer/qchartsplugin.h @@ -2,19 +2,17 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** 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. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ diff --git a/tests/manual/chartdesigner/brushwidget.cpp b/tests/manual/chartdesigner/brushwidget.cpp index 6e61500..540d740 100644 --- a/tests/manual/chartdesigner/brushwidget.cpp +++ b/tests/manual/chartdesigner/brushwidget.cpp @@ -2,19 +2,17 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** 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. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ diff --git a/tests/manual/chartdesigner/brushwidget.h b/tests/manual/chartdesigner/brushwidget.h index 7f570cb..734065b 100644 --- a/tests/manual/chartdesigner/brushwidget.h +++ b/tests/manual/chartdesigner/brushwidget.h @@ -2,19 +2,17 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** 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. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ diff --git a/tests/manual/chartdesigner/engine.cpp b/tests/manual/chartdesigner/engine.cpp index b7ea9e9..dc542ca 100644 --- a/tests/manual/chartdesigner/engine.cpp +++ b/tests/manual/chartdesigner/engine.cpp @@ -1,22 +1,20 @@ /**************************************************************************** - ** - ** Copyright (C) 2014 Digia Plc - ** All rights reserved. - ** For any questions to Digia, please use contact form at http://qt.digia.com - ** - ** This file is part of the Qt Enterprise Charts Add-on. - ** - ** $QT_BEGIN_LICENSE$ - ** Licensees holding valid Qt Enterprise licenses may use this file in - ** accordance with the Qt Enterprise License Agreement provided with the - ** Software or, alternatively, in accordance with the terms contained in - ** a written agreement between you and Digia. - ** - ** If you have questions regarding the use of this file, please use - ** contact form at http://qt.digia.com - ** $QT_END_LICENSE$ - ** - ****************************************************************************/ +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.io +** +** This file is part of the Qt Charts 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. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.io +** +****************************************************************************/ #include "engine.h" #include diff --git a/tests/manual/chartdesigner/engine.h b/tests/manual/chartdesigner/engine.h index eef15dc..a3f3ddf 100644 --- a/tests/manual/chartdesigner/engine.h +++ b/tests/manual/chartdesigner/engine.h @@ -1,22 +1,20 @@ /**************************************************************************** - ** - ** Copyright (C) 2014 Digia Plc - ** All rights reserved. - ** For any questions to Digia, please use contact form at http://qt.digia.com - ** - ** This file is part of the Qt Enterprise Charts Add-on. - ** - ** $QT_BEGIN_LICENSE$ - ** Licensees holding valid Qt Enterprise licenses may use this file in - ** accordance with the Qt Enterprise License Agreement provided with the - ** Software or, alternatively, in accordance with the terms contained in - ** a written agreement between you and Digia. - ** - ** If you have questions regarding the use of this file, please use - ** contact form at http://qt.digia.com - ** $QT_END_LICENSE$ - ** - ****************************************************************************/ +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.io +** +** This file is part of the Qt Charts 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. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.io +** +****************************************************************************/ #ifndef ENGINE_H #define ENGINE_H diff --git a/tests/manual/chartdesigner/main.cpp b/tests/manual/chartdesigner/main.cpp index 6b47caf..4fc2e8c 100644 --- a/tests/manual/chartdesigner/main.cpp +++ b/tests/manual/chartdesigner/main.cpp @@ -2,19 +2,17 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** 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. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ diff --git a/tests/manual/chartdesigner/mainwindow.cpp b/tests/manual/chartdesigner/mainwindow.cpp index 7058845..d16aab8 100644 --- a/tests/manual/chartdesigner/mainwindow.cpp +++ b/tests/manual/chartdesigner/mainwindow.cpp @@ -1,22 +1,20 @@ /**************************************************************************** - ** - ** Copyright (C) 2014 Digia Plc - ** All rights reserved. - ** For any questions to Digia, please use contact form at http://qt.digia.com - ** - ** This file is part of the Qt Enterprise Charts Add-on. - ** - ** $QT_BEGIN_LICENSE$ - ** Licensees holding valid Qt Enterprise licenses may use this file in - ** accordance with the Qt Enterprise License Agreement provided with the - ** Software or, alternatively, in accordance with the terms contained in - ** a written agreement between you and Digia. - ** - ** If you have questions regarding the use of this file, please use - ** contact form at http://qt.digia.com - ** $QT_END_LICENSE$ - ** - ****************************************************************************/ +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.io +** +** This file is part of the Qt Charts 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. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.io +** +****************************************************************************/ #include "mainwindow.h" #include "objectinspectorwidget.h" diff --git a/tests/manual/chartdesigner/mainwindow.h b/tests/manual/chartdesigner/mainwindow.h index d5ce541..a70b6cf 100644 --- a/tests/manual/chartdesigner/mainwindow.h +++ b/tests/manual/chartdesigner/mainwindow.h @@ -2,19 +2,17 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** 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. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ diff --git a/tests/manual/chartdesigner/objectinspectorwidget.cpp b/tests/manual/chartdesigner/objectinspectorwidget.cpp index 64a8985..a032ef1 100644 --- a/tests/manual/chartdesigner/objectinspectorwidget.cpp +++ b/tests/manual/chartdesigner/objectinspectorwidget.cpp @@ -2,19 +2,17 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** 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. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ diff --git a/tests/manual/chartdesigner/objectinspectorwidget.h b/tests/manual/chartdesigner/objectinspectorwidget.h index ba9deed..c4eebc5 100644 --- a/tests/manual/chartdesigner/objectinspectorwidget.h +++ b/tests/manual/chartdesigner/objectinspectorwidget.h @@ -2,19 +2,17 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** 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. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ diff --git a/tests/manual/chartdesigner/penwidget.cpp b/tests/manual/chartdesigner/penwidget.cpp index e2b22f6..ff5880b 100644 --- a/tests/manual/chartdesigner/penwidget.cpp +++ b/tests/manual/chartdesigner/penwidget.cpp @@ -2,19 +2,17 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** 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. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ diff --git a/tests/manual/chartdesigner/penwidget.h b/tests/manual/chartdesigner/penwidget.h index fe9998c..157066a 100644 --- a/tests/manual/chartdesigner/penwidget.h +++ b/tests/manual/chartdesigner/penwidget.h @@ -2,19 +2,17 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** 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. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ diff --git a/tools/demoLauncher/graphicsbutton.cpp b/tools/demoLauncher/graphicsbutton.cpp index c40ae6d..7217cf6 100644 --- a/tools/demoLauncher/graphicsbutton.cpp +++ b/tools/demoLauncher/graphicsbutton.cpp @@ -2,19 +2,17 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** 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. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ diff --git a/tools/demoLauncher/graphicsbutton.h b/tools/demoLauncher/graphicsbutton.h index b861914..c3277e4 100644 --- a/tools/demoLauncher/graphicsbutton.h +++ b/tools/demoLauncher/graphicsbutton.h @@ -2,19 +2,17 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** 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. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ diff --git a/tools/demoLauncher/main.cpp b/tools/demoLauncher/main.cpp index 82986d3..7530311 100644 --- a/tools/demoLauncher/main.cpp +++ b/tools/demoLauncher/main.cpp @@ -2,19 +2,17 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** 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. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ diff --git a/tools/demoLauncher/widget.cpp b/tools/demoLauncher/widget.cpp index f8ac5da..6b0d1b4 100644 --- a/tools/demoLauncher/widget.cpp +++ b/tools/demoLauncher/widget.cpp @@ -2,19 +2,17 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** 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. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ diff --git a/tools/demoLauncher/widget.h b/tools/demoLauncher/widget.h index 1e3b105..44a1695 100644 --- a/tools/demoLauncher/widget.h +++ b/tools/demoLauncher/widget.h @@ -2,19 +2,17 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** 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. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/