From c8989ca20fa5798f7853f07df6e150cc407c64a4 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Thu, 18 Mar 2021 17:29:29 +0200 Subject: Revert "Update commercial license headers to /util files" This reverts commit d7f95124da230cafe26896e537e3a3a1af1fd9bb. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: Ifad15cc26055eed6c82e30b5b68bb33d070bae0e Reviewed-by: Akseli Salovaara --- util/edid/qedidvendortable.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'util/edid/qedidvendortable.py') diff --git a/util/edid/qedidvendortable.py b/util/edid/qedidvendortable.py index 0bbdead6b9..6fc45dbc17 100755 --- a/util/edid/qedidvendortable.py +++ b/util/edid/qedidvendortable.py @@ -6,8 +6,7 @@ ## ## This file is part of the plugins 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 @@ -16,16 +15,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$ ## -############################################################################ +############################################################################# import urllib.request -- cgit v1.2.3