From 0773a0fb667d7330030da9146eb8d3805f239478 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 10 Sep 2020 15:37:02 +0200 Subject: [PATCH] Autotest auto tests: Fix license No point in using a commercial-only license here. Change-Id: Ic8f38c4a09dcfaf6c1a537bdfd97cb9eedf50dd8 Reviewed-by: Christian Stenger --- .../tests/auto/quickauto3/tst_test1.qml | 24 ++++++++++++------- .../tests/auto/quickauto3/tst_test2.qml | 24 ++++++++++++------- 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto3/tst_test1.qml b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto3/tst_test1.qml index 08ca094a5f5..b8c4cd2a274 100644 --- a/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto3/tst_test1.qml +++ b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto3/tst_test1.qml @@ -1,19 +1,25 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd -** All rights reserved. -** For any questions to The Qt Company, please use contact form at -** http://www.qt.io/contact-us +** Copyright (C) 2020 The Qt Company Ltd +** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator. ** -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the +** 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. +** 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. ** -** If you have questions regarding the use of this file, please use -** contact form at http://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. ** ****************************************************************************/ import QtQuick 2.0 diff --git a/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto3/tst_test2.qml b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto3/tst_test2.qml index de990edc59f..edc524ce556 100644 --- a/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto3/tst_test2.qml +++ b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto3/tst_test2.qml @@ -1,19 +1,25 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd -** All rights reserved. -** For any questions to The Qt Company, please use contact form at -** http://www.qt.io/contact-us +** Copyright (C) 2020 The Qt Company Ltd +** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator. ** -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the +** 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. +** 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. ** -** If you have questions regarding the use of this file, please use -** contact form at http://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. ** ****************************************************************************/ import QtQuick 2.0