From 0f095faf67f25abf73cef8da80704bb589978d39 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 25 Jan 2016 15:47:43 +0100 Subject: Update license headers Change-Id: If100cc6cfeccc9ec4f13e03d69edfb7fad6bc2f6 Reviewed-by: Alex Blasche --- tests/3rdparty/gen-scion-tests.py | 33 ++++++++++++++-------- tests/auto/parser/namespaces1.scxml | 29 +++++++++++++++++++ tests/auto/parser/test1.scxml | 29 +++++++++++++++++++ tests/auto/parser/tst_parser.cpp | 34 +++++++++++----------- tests/auto/scion/tst_scion.cpp | 42 +++++++++++++++++----------- tests/auto/statemachine/test1.scxml | 29 +++++++++++++++++++ tests/auto/statemachine/tst_statemachine.cpp | 32 ++++++++++----------- tests/manual/cppgen/tst_cppgen.cpp | 42 +++++++++++++++++----------- tests/manual/testCpp/genTestSxcml.py | 33 ++++++++++++++-------- tests/manual/testCpp/testcpp.cpp | 42 +++++++++++++++++----------- 10 files changed, 238 insertions(+), 107 deletions(-) (limited to 'tests') diff --git a/tests/3rdparty/gen-scion-tests.py b/tests/3rdparty/gen-scion-tests.py index 40c66fa..91bd192 100755 --- a/tests/3rdparty/gen-scion-tests.py +++ b/tests/3rdparty/gen-scion-tests.py @@ -1,19 +1,28 @@ #!/usr/bin/python -# Copyright (c) 2015 Digia Plc -# For any questions to Digia, please use contact form at http://qt.digia.com/ +# Copyright (C) 2016 The Qt Company Ltd. +# Contact: https://www.qt.io/licensing/ # -# All Rights Reserved. +# This file is part of the QtScxml module of the Qt Toolkit. # -# NOTICE: All information contained herein is, and remains -# the property of Digia Plc and its suppliers, -# if any. The intellectual and technical concepts contained -# herein are proprietary to Digia Plc -# and its suppliers and may be covered by Finnish and Foreign Patents, -# patents in process, and are protected by trade secret or copyright law. -# Dissemination of this information or reproduction of this material -# is strictly forbidden unless prior written permission is obtained -# from Digia Plc. +# $QT_BEGIN_LICENSE:GPL-EXCEPT$ +# 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 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 as published by the Free Software +# Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +# 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$ from os import walk from os.path import isfile, join, splitext diff --git a/tests/auto/parser/namespaces1.scxml b/tests/auto/parser/namespaces1.scxml index ffbf57d..c691302 100644 --- a/tests/auto/parser/namespaces1.scxml +++ b/tests/auto/parser/namespaces1.scxml @@ -1,4 +1,33 @@ + diff --git a/tests/auto/parser/test1.scxml b/tests/auto/parser/test1.scxml index 05c842c..580531f 100644 --- a/tests/auto/parser/test1.scxml +++ b/tests/auto/parser/test1.scxml @@ -1,4 +1,33 @@ + diff --git a/tests/auto/parser/tst_parser.cpp b/tests/auto/parser/tst_parser.cpp index 8d856ee..9fc24a7 100644 --- a/tests/auto/parser/tst_parser.cpp +++ b/tests/auto/parser/tst_parser.cpp @@ -1,30 +1,28 @@ /**************************************************************************** ** -** 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 Qt Creator. +** This file is part of the QtScxml module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** 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. ** -** In addition, as a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -51,7 +49,7 @@ void tst_Parser::error_data() QTest::addColumn >("expectedErrors"); QVector errors; - errors << QScxmlError(QString(":/tst_parser/test1.scxml"), 5, 46, QString("unknown state 'b' in target")); + errors << QScxmlError(QString(":/tst_parser/test1.scxml"), 34, 46, QString("unknown state 'b' in target")); QTest::newRow("test1") << QString(":/tst_parser/test1.scxml") << errors; QTest::newRow("namespaces 1") << QStringLiteral(":/tst_parser/namespaces1.scxml") << QVector(); diff --git a/tests/auto/scion/tst_scion.cpp b/tests/auto/scion/tst_scion.cpp index 29fb441..86a4403 100644 --- a/tests/auto/scion/tst_scion.cpp +++ b/tests/auto/scion/tst_scion.cpp @@ -1,20 +1,30 @@ /**************************************************************************** - ** - ** Copyright (c) 2015 Digia Plc - ** For any questions to Digia, please use contact form at http://qt.digia.com/ - ** - ** All Rights Reserved. - ** - ** NOTICE: All information contained herein is, and remains - ** the property of Digia Plc and its suppliers, - ** if any. The intellectual and technical concepts contained - ** herein are proprietary to Digia Plc - ** and its suppliers and may be covered by Finnish and Foreign Patents, - ** patents in process, and are protected by trade secret or copyright law. - ** Dissemination of this information or reproduction of this material - ** is strictly forbidden unless prior written permission is obtained - ** from Digia Plc. - ****************************************************************************/ +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtScxml module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** 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 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 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** 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$ +** +****************************************************************************/ #include #include diff --git a/tests/auto/statemachine/test1.scxml b/tests/auto/statemachine/test1.scxml index 366d849..3f282f1 100644 --- a/tests/auto/statemachine/test1.scxml +++ b/tests/auto/statemachine/test1.scxml @@ -1,4 +1,33 @@ + diff --git a/tests/auto/statemachine/tst_statemachine.cpp b/tests/auto/statemachine/tst_statemachine.cpp index 165607e..8284802 100644 --- a/tests/auto/statemachine/tst_statemachine.cpp +++ b/tests/auto/statemachine/tst_statemachine.cpp @@ -1,30 +1,28 @@ /**************************************************************************** ** -** 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 Qt Creator. +** This file is part of the QtScxml module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** 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. ** -** In addition, as a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/tests/manual/cppgen/tst_cppgen.cpp b/tests/manual/cppgen/tst_cppgen.cpp index b96f38e..298a6ab 100644 --- a/tests/manual/cppgen/tst_cppgen.cpp +++ b/tests/manual/cppgen/tst_cppgen.cpp @@ -1,20 +1,30 @@ /**************************************************************************** - ** - ** Copyright (c) 2015 Digia Plc - ** For any questions to Digia, please use contact form at http://qt.digia.com/ - ** - ** All Rights Reserved. - ** - ** NOTICE: All information contained herein is, and remains - ** the property of Digia Plc and its suppliers, - ** if any. The intellectual and technical concepts contained - ** herein are proprietary to Digia Plc - ** and its suppliers and may be covered by Finnish and Foreign Patents, - ** patents in process, and are protected by trade secret or copyright law. - ** Dissemination of this information or reproduction of this material - ** is strictly forbidden unless prior written permission is obtained - ** from Digia Plc. - ****************************************************************************/ +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtScxml module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** 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 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 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** 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$ +** +****************************************************************************/ #include diff --git a/tests/manual/testCpp/genTestSxcml.py b/tests/manual/testCpp/genTestSxcml.py index 8fc43a5..9170212 100644 --- a/tests/manual/testCpp/genTestSxcml.py +++ b/tests/manual/testCpp/genTestSxcml.py @@ -1,17 +1,26 @@ -# Copyright (c) 2015 Digia Plc -# For any questions to Digia, please use contact form at http://qt.digia.com/ +# Copyright (C) 2016 The Qt Company Ltd. +# Contact: https://www.qt.io/licensing/ # -# All Rights Reserved. +# This file is part of the QtScxml module of the Qt Toolkit. # -# NOTICE: All information contained herein is, and remains -# the property of Digia Plc and its suppliers, -# if any. The intellectual and technical concepts contained -# herein are proprietary to Digia Plc -# and its suppliers and may be covered by Finnish and Foreign Patents, -# patents in process, and are protected by trade secret or copyright law. -# Dissemination of this information or reproduction of this material -# is strictly forbidden unless prior written permission is obtained -# from Digia Plc. +# $QT_BEGIN_LICENSE:GPL-EXCEPT$ +# 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 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 as published by the Free Software +# Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +# 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$ import random """stupid generator of a large scxml state machine""" diff --git a/tests/manual/testCpp/testcpp.cpp b/tests/manual/testCpp/testcpp.cpp index 2e49294..2da6529 100644 --- a/tests/manual/testCpp/testcpp.cpp +++ b/tests/manual/testCpp/testcpp.cpp @@ -1,20 +1,30 @@ /**************************************************************************** - ** - ** Copyright (c) 2015 Digia Plc - ** For any questions to Digia, please use contact form at http://qt.digia.com/ - ** - ** All Rights Reserved. - ** - ** NOTICE: All information contained herein is, and remains - ** the property of Digia Plc and its suppliers, - ** if any. The intellectual and technical concepts contained - ** herein are proprietary to Digia Plc - ** and its suppliers and may be covered by Finnish and Foreign Patents, - ** patents in process, and are protected by trade secret or copyright law. - ** Dissemination of this information or reproduction of this material - ** is strictly forbidden unless prior written permission is obtained - ** from Digia Plc. - ****************************************************************************/ +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtScxml module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** 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 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 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** 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$ +** +****************************************************************************/ #include #include -- cgit v1.2.3