diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-03-18 12:17:11 +0200 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-03-23 10:39:20 +0200 |
commit | 2c53a16f431bbb950bfca8ac32ddabf217a0bf04 (patch) | |
tree | 8c5991cd7360a3fc168d6e673e255a674fda3e6a /tools/testcon/controlinfo.ui | |
parent | 29b16574937cf974ecca55fae6686316db4566ae (diff) |
Revert "Update commercial license headers"v5.15.3-lts-lgpl
This reverts commit 29b16574937cf974ecca55fae6686316db4566ae.
Revert of commercial license headers is required for Qt 5.15.3
opensource release.
Task-number: QTBUG-91108
Change-Id: Icf0f85998ee5e75392d9c3240fca7c30a53923ef
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Diffstat (limited to 'tools/testcon/controlinfo.ui')
-rw-r--r-- | tools/testcon/controlinfo.ui | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/testcon/controlinfo.ui b/tools/testcon/controlinfo.ui index 49e5b4c..1023561 100644 --- a/tools/testcon/controlinfo.ui +++ b/tools/testcon/controlinfo.ui @@ -2,13 +2,12 @@ <author></author> <comment>********************************************************************* ** -** Copyright (C) 2021 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:COMM$ -** +** $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 @@ -17,16 +16,17 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** $QT_END_LICENSE$ -** -** -** -** -** -** +** 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$ ** -****************************************************************************</comment> +*********************************************************************</comment> <exportmacro></exportmacro> <class>ControlInfo</class> <widget class="QDialog" name="ControlInfo" > |