From c9d11cc9915dea32d1aff9d63427bca1c3399400 Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Thu, 26 Jan 2017 09:30:45 +0200 Subject: License header update to GPL-EXCEPT Change-Id: I6426c4e8f932cf26c6c638dec18d0c12e22972d1 Reviewed-by: Janne Anttila --- doc/fixnavi.pl | 29 ++++++++++++----------------- doc/installerfw-cpp-classes.qdoc | 2 +- doc/installerfw-examples.qdoc | 2 +- doc/installerfw-getting-started.qdoc | 2 +- doc/installerfw-online.qdocconf | 2 +- doc/installerfw-overview.qdoc | 2 +- doc/installerfw-reference.qdoc | 2 +- doc/installerfw-using.qdoc | 2 +- doc/installerfw.qdoc | 2 +- doc/messageboxhandler.qdoc | 2 +- doc/noninteractive.qdoc | 2 +- doc/operations.qdoc | 2 +- doc/scripting-api/buttons.qdoc | 2 +- doc/scripting-api/component.qdoc | 2 +- doc/scripting-api/console.qdoc | 2 +- doc/scripting-api/gui.qdoc | 2 +- doc/scripting-api/packagemanagercore.qdoc | 2 +- doc/scripting-api/print.qdoc | 2 +- doc/scripting-api/qdesktopservices.qdoc | 2 +- doc/scripting-api/qfiledialog.qdoc | 2 +- doc/scripting-api/qinstaller.qdoc | 2 +- doc/scripting-qmlmodule.qdoc | 2 +- doc/scripting.qdoc | 2 +- doc/systeminfo.qdoc | 2 +- doc/tutorial.qdoc | 2 +- 25 files changed, 36 insertions(+), 41 deletions(-) (limited to 'doc') 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$ ## diff --git a/doc/installerfw-cpp-classes.qdoc b/doc/installerfw-cpp-classes.qdoc index ce88bc9d9..6b22c92a8 100644 --- a/doc/installerfw-cpp-classes.qdoc +++ b/doc/installerfw-cpp-classes.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/installerfw-examples.qdoc b/doc/installerfw-examples.qdoc index 720a7bbeb..068ca52f7 100644 --- a/doc/installerfw-examples.qdoc +++ b/doc/installerfw-examples.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc index 08c5b5682..e231e0f95 100644 --- a/doc/installerfw-getting-started.qdoc +++ b/doc/installerfw-getting-started.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/installerfw-online.qdocconf b/doc/installerfw-online.qdocconf index aad3486ad..a13ad9df2 100644 --- a/doc/installerfw-online.qdocconf +++ b/doc/installerfw-online.qdocconf @@ -4,7 +4,7 @@ include(config/ifw.qdocconf) HTML.footer = \ " \n" \ "

\n" \ - " © 2016 The Qt Company Ltd.\n" \ + " © 2017 The Qt Company Ltd.\n" \ " Documentation contributions included herein are the copyrights of\n" \ " their respective owners. " \ " The documentation provided herein is licensed under the terms of the" \ diff --git a/doc/installerfw-overview.qdoc b/doc/installerfw-overview.qdoc index 3554aebc0..ee93fcf5a 100644 --- a/doc/installerfw-overview.qdoc +++ b/doc/installerfw-overview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/installerfw-reference.qdoc b/doc/installerfw-reference.qdoc index 9232e73d3..3f002fa73 100644 --- a/doc/installerfw-reference.qdoc +++ b/doc/installerfw-reference.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/installerfw-using.qdoc b/doc/installerfw-using.qdoc index 88e80fc3d..36df3bed9 100644 --- a/doc/installerfw-using.qdoc +++ b/doc/installerfw-using.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index ac1472849..94659711a 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/messageboxhandler.qdoc b/doc/messageboxhandler.qdoc index 63cce62fe..22eedf9f8 100644 --- a/doc/messageboxhandler.qdoc +++ b/doc/messageboxhandler.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/noninteractive.qdoc b/doc/noninteractive.qdoc index 37da91933..a2bb5f901 100644 --- a/doc/noninteractive.qdoc +++ b/doc/noninteractive.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/operations.qdoc b/doc/operations.qdoc index 99330698a..243ff7771 100644 --- a/doc/operations.qdoc +++ b/doc/operations.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/scripting-api/buttons.qdoc b/doc/scripting-api/buttons.qdoc index a4b7e2d4d..a96d68434 100644 --- a/doc/scripting-api/buttons.qdoc +++ b/doc/scripting-api/buttons.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/scripting-api/component.qdoc b/doc/scripting-api/component.qdoc index 1765a1217..6e55615b7 100644 --- a/doc/scripting-api/component.qdoc +++ b/doc/scripting-api/component.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/scripting-api/console.qdoc b/doc/scripting-api/console.qdoc index 9792fb33a..efa17080a 100644 --- a/doc/scripting-api/console.qdoc +++ b/doc/scripting-api/console.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/scripting-api/gui.qdoc b/doc/scripting-api/gui.qdoc index 5883fb50c..9697c8b21 100644 --- a/doc/scripting-api/gui.qdoc +++ b/doc/scripting-api/gui.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/scripting-api/packagemanagercore.qdoc b/doc/scripting-api/packagemanagercore.qdoc index 53e1fbf9c..cbb7b477b 100644 --- a/doc/scripting-api/packagemanagercore.qdoc +++ b/doc/scripting-api/packagemanagercore.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/scripting-api/print.qdoc b/doc/scripting-api/print.qdoc index 7857d0abc..82a432f6b 100644 --- a/doc/scripting-api/print.qdoc +++ b/doc/scripting-api/print.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/scripting-api/qdesktopservices.qdoc b/doc/scripting-api/qdesktopservices.qdoc index 86f5c6ac5..4fa403dbd 100644 --- a/doc/scripting-api/qdesktopservices.qdoc +++ b/doc/scripting-api/qdesktopservices.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/scripting-api/qfiledialog.qdoc b/doc/scripting-api/qfiledialog.qdoc index e9d72aa86..ecce6f59d 100644 --- a/doc/scripting-api/qfiledialog.qdoc +++ b/doc/scripting-api/qfiledialog.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/scripting-api/qinstaller.qdoc b/doc/scripting-api/qinstaller.qdoc index 7a3531824..6f2af4025 100644 --- a/doc/scripting-api/qinstaller.qdoc +++ b/doc/scripting-api/qinstaller.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/scripting-qmlmodule.qdoc b/doc/scripting-qmlmodule.qdoc index f3aa3381c..eb4561090 100644 --- a/doc/scripting-qmlmodule.qdoc +++ b/doc/scripting-qmlmodule.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/scripting.qdoc b/doc/scripting.qdoc index 69c9ec5a2..b430c0464 100644 --- a/doc/scripting.qdoc +++ b/doc/scripting.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/systeminfo.qdoc b/doc/systeminfo.qdoc index 1a178a319..fde826066 100644 --- a/doc/systeminfo.qdoc +++ b/doc/systeminfo.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. diff --git a/doc/tutorial.qdoc b/doc/tutorial.qdoc index b7d4ae308..df53d22a6 100644 --- a/doc/tutorial.qdoc +++ b/doc/tutorial.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. -- cgit v1.2.3