From 0fc8e31af9e3dcf47bbe4520a980e4fc3cfd4438 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 18 Aug 2022 14:19:26 +0200 Subject: QmlDesigner: Fix some more license headers Change-Id: I19419745ce79a339875e92e86d7e599a8c2ddeb0 Reviewed-by: Lucie Gerard Reviewed-by: Thomas Hartmann Reviewed-by: --- .../qmldesigner/studioplugin/studioplugin.cpp | 25 ++++++++++++++-------- .../qmldesigner/studioplugin/studioplugin.h | 25 ++++++++++++++-------- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/src/plugins/qmldesigner/studioplugin/studioplugin.cpp b/src/plugins/qmldesigner/studioplugin/studioplugin.cpp index 6d3f7b8e8b4..313d97c1238 100644 --- a/src/plugins/qmldesigner/studioplugin/studioplugin.cpp +++ b/src/plugins/qmldesigner/studioplugin/studioplugin.cpp @@ -1,18 +1,25 @@ /**************************************************************************** ** -** Copyright (C) 2017 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) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Enterprise QML Live Preview Add-on. +** 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. ** ****************************************************************************/ diff --git a/src/plugins/qmldesigner/studioplugin/studioplugin.h b/src/plugins/qmldesigner/studioplugin/studioplugin.h index 28f04a7d110..5543b03946b 100644 --- a/src/plugins/qmldesigner/studioplugin/studioplugin.h +++ b/src/plugins/qmldesigner/studioplugin/studioplugin.h @@ -1,18 +1,25 @@ /**************************************************************************** ** -** Copyright (C) 2017 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) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Enterprise QML Live Preview Add-on. +** 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. ** ****************************************************************************/ -- cgit v1.2.3