diff options
author | Robert Griebl <robert.griebl@pelagicore.com> | 2016-04-08 00:25:43 +0200 |
---|---|---|
committer | Robert Griebl <robert.griebl@pelagicore.com> | 2016-04-11 20:02:26 +0000 |
commit | b3b69bf0b6613c94270a99bd7f3d91679a156b53 (patch) | |
tree | 247ef6d1d1f7dd33915e2055e5d036ae2d116f8b /doc | |
parent | 456013760025b321b9b2a81a80c43fa4b644770c (diff) | |
download | qtapplicationmanager-b3b69bf0b6613c94270a99bd7f3d91679a156b53.tar.gz |
Use the same license wording for GPL3 as the standard Qt 5.7 license.
Change-Id: I0f8cb01cd1239bf70434f3b39392a1464c32620e
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/apps.qdoc | 27 | ||||
-rw-r--r-- | doc/configuration.qdoc | 27 | ||||
-rw-r--r-- | doc/elements-apps.qdoc | 27 | ||||
-rw-r--r-- | doc/elements-systemui.qdoc | 27 | ||||
-rw-r--r-- | doc/index.qdoc | 27 | ||||
-rw-r--r-- | doc/installation.qdoc | 27 | ||||
-rw-r--r-- | doc/installer.qdoc | 27 | ||||
-rw-r--r-- | doc/manifest.qdoc | 27 | ||||
-rw-r--r-- | doc/systemui.qdoc | 27 |
9 files changed, 126 insertions, 117 deletions
diff --git a/doc/apps.qdoc b/doc/apps.qdoc index 20400f86..c79b9248 100644 --- a/doc/apps.qdoc +++ b/doc/apps.qdoc @@ -1,26 +1,27 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Pelagicore Application Manager. ** -** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Pelagicore Application Manager -** 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 -** Pelagicore. For licensing terms and conditions, contact us at: -** http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite 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 https://www.qt.io/terms-conditions. +** For further information use the contact form at https://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 and appearing in the file LICENSE.GPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3 requirements will be -** met: http://www.gnu.org/licenses/gpl-3.0.html. +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** 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/configuration.qdoc b/doc/configuration.qdoc index 75c6c210..887c8614 100644 --- a/doc/configuration.qdoc +++ b/doc/configuration.qdoc @@ -1,26 +1,27 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Pelagicore Application Manager. ** -** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Pelagicore Application Manager -** 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 -** Pelagicore. For licensing terms and conditions, contact us at: -** http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite 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 https://www.qt.io/terms-conditions. +** For further information use the contact form at https://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 and appearing in the file LICENSE.GPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3 requirements will be -** met: http://www.gnu.org/licenses/gpl-3.0.html. +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** 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/elements-apps.qdoc b/doc/elements-apps.qdoc index 9ab424f1..62d28f30 100644 --- a/doc/elements-apps.qdoc +++ b/doc/elements-apps.qdoc @@ -1,26 +1,27 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Pelagicore Application Manager. ** -** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Pelagicore Application Manager -** 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 -** Pelagicore. For licensing terms and conditions, contact us at: -** http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite 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 https://www.qt.io/terms-conditions. +** For further information use the contact form at https://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 and appearing in the file LICENSE.GPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3 requirements will be -** met: http://www.gnu.org/licenses/gpl-3.0.html. +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** 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/elements-systemui.qdoc b/doc/elements-systemui.qdoc index 0e18ca2b..d41478ea 100644 --- a/doc/elements-systemui.qdoc +++ b/doc/elements-systemui.qdoc @@ -1,26 +1,27 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Pelagicore Application Manager. ** -** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Pelagicore Application Manager -** 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 -** Pelagicore. For licensing terms and conditions, contact us at: -** http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite 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 https://www.qt.io/terms-conditions. +** For further information use the contact form at https://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 and appearing in the file LICENSE.GPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3 requirements will be -** met: http://www.gnu.org/licenses/gpl-3.0.html. +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** 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/index.qdoc b/doc/index.qdoc index 920f4af9..5d9fa536 100644 --- a/doc/index.qdoc +++ b/doc/index.qdoc @@ -1,26 +1,27 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Pelagicore Application Manager. ** -** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Pelagicore Application Manager -** 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 -** Pelagicore. For licensing terms and conditions, contact us at: -** http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite 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 https://www.qt.io/terms-conditions. +** For further information use the contact form at https://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 and appearing in the file LICENSE.GPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3 requirements will be -** met: http://www.gnu.org/licenses/gpl-3.0.html. +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** 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/installation.qdoc b/doc/installation.qdoc index 682c99bb..8619c49e 100644 --- a/doc/installation.qdoc +++ b/doc/installation.qdoc @@ -1,26 +1,27 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Pelagicore Application Manager. ** -** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Pelagicore Application Manager -** 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 -** Pelagicore. For licensing terms and conditions, contact us at: -** http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite 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 https://www.qt.io/terms-conditions. +** For further information use the contact form at https://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 and appearing in the file LICENSE.GPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3 requirements will be -** met: http://www.gnu.org/licenses/gpl-3.0.html. +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** 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/installer.qdoc b/doc/installer.qdoc index e579d431..2c5ec875 100644 --- a/doc/installer.qdoc +++ b/doc/installer.qdoc @@ -1,26 +1,27 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Pelagicore Application Manager. ** -** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Pelagicore Application Manager -** 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 -** Pelagicore. For licensing terms and conditions, contact us at: -** http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite 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 https://www.qt.io/terms-conditions. +** For further information use the contact form at https://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 and appearing in the file LICENSE.GPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3 requirements will be -** met: http://www.gnu.org/licenses/gpl-3.0.html. +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** 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/manifest.qdoc b/doc/manifest.qdoc index c2c985f1..32c1c40a 100644 --- a/doc/manifest.qdoc +++ b/doc/manifest.qdoc @@ -1,26 +1,27 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Pelagicore Application Manager. ** -** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Pelagicore Application Manager -** 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 -** Pelagicore. For licensing terms and conditions, contact us at: -** http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite 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 https://www.qt.io/terms-conditions. +** For further information use the contact form at https://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 and appearing in the file LICENSE.GPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3 requirements will be -** met: http://www.gnu.org/licenses/gpl-3.0.html. +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** 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/systemui.qdoc b/doc/systemui.qdoc index cb08d3fe..81d3cf3c 100644 --- a/doc/systemui.qdoc +++ b/doc/systemui.qdoc @@ -1,26 +1,27 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Pelagicore Application Manager. ** -** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Pelagicore Application Manager -** 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 -** Pelagicore. For licensing terms and conditions, contact us at: -** http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite 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 https://www.qt.io/terms-conditions. +** For further information use the contact form at https://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 and appearing in the file LICENSE.GPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3 requirements will be -** met: http://www.gnu.org/licenses/gpl-3.0.html. +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** 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$ ** |