summaryrefslogtreecommitdiffstats
path: root/doc/fixnavi.pl
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2017-01-26 09:30:45 +0200
committerKatja Marttila <katja.marttila@qt.io>2017-01-26 10:02:56 +0000
commitc9d11cc9915dea32d1aff9d63427bca1c3399400 (patch)
tree90d8f908eefc6c5b387a65e80c34b15c2a08d35a /doc/fixnavi.pl
parent6189be519b1eb20187ec44928cad8ef1f7d69007 (diff)
License header update to GPL-EXCEPT
Change-Id: I6426c4e8f932cf26c6c638dec18d0c12e22972d1 Reviewed-by: Janne Anttila <janne.anttila@theqtcompany.com>
Diffstat (limited to 'doc/fixnavi.pl')
-rw-r--r--doc/fixnavi.pl29
1 files changed, 12 insertions, 17 deletions
diff --git a/doc/fixnavi.pl b/doc/fixnavi.pl
index bc7a9ad28..1f7e96bfd 100644
--- a/doc/fixnavi.pl
+++ b/doc/fixnavi.pl
@@ -1,32 +1,27 @@
#!/usr/bin/env perl
#############################################################################
##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
##
## This file is part of the Qt Installer Framework.
##
-## $QT_BEGIN_LICENSE:LGPL21$
+## $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.
+## 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.
-##
-## 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.
+## 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$
##