|
 |
ebefeac |
From f9d5fc2e94c2116130456f4b4f8bd2f3a0c88d20 Mon Sep 17 00:00:00 2001
|
|
|
ebefeac |
From: Kai Koehne <kai.koehne@qt.io>
|
|
|
ebefeac |
Date: Tue, 27 Oct 2020 16:12:30 +0100
|
|
|
ebefeac |
Subject: [PATCH 02/19] Replace remaining LGPLv3 headers in QtWaylandCompositor
|
|
|
ebefeac |
with GPLv3
|
|
|
ebefeac |
|
|
|
ebefeac |
Use same header as for the rest of the module.
|
|
|
ebefeac |
|
|
|
ebefeac |
This was forgotten in commit bb1b46a4862e0a5
|
|
|
ebefeac |
|
|
|
ebefeac |
Change-Id: I7e61b43f0387a9affa9488566cb5aaca51b3bc0b
|
|
|
ebefeac |
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
|
|
|
ebefeac |
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
|
|
|
ebefeac |
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
ebefeac |
(cherry picked from commit 2bf41c736719654d0d6b15eec280a4667ebc28c5)
|
|
|
ebefeac |
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
ebefeac |
---
|
|
|
ebefeac |
.../extensions/qwaylandidleinhibitv1.cpp | 27 +++++++------------
|
|
|
ebefeac |
.../extensions/qwaylandidleinhibitv1.h | 27 +++++++------------
|
|
|
ebefeac |
.../extensions/qwaylandidleinhibitv1_p.h | 27 +++++++------------
|
|
|
ebefeac |
.../extensions/qwaylandquickxdgoutputv1.cpp | 27 +++++++------------
|
|
|
ebefeac |
.../extensions/qwaylandquickxdgoutputv1.h | 27 +++++++------------
|
|
|
ebefeac |
.../extensions/qwaylandviewporter.cpp | 27 +++++++------------
|
|
|
ebefeac |
.../extensions/qwaylandviewporter.h | 27 +++++++------------
|
|
|
ebefeac |
.../extensions/qwaylandviewporter_p.h | 27 +++++++------------
|
|
|
ebefeac |
.../extensions/qwaylandxdgdecorationv1.cpp | 27 +++++++------------
|
|
|
ebefeac |
.../extensions/qwaylandxdgdecorationv1.h | 27 +++++++------------
|
|
|
ebefeac |
.../extensions/qwaylandxdgdecorationv1_p.h | 27 +++++++------------
|
|
|
ebefeac |
.../extensions/qwaylandxdgoutputv1.cpp | 27 +++++++------------
|
|
|
ebefeac |
.../extensions/qwaylandxdgoutputv1.h | 27 +++++++------------
|
|
|
ebefeac |
.../extensions/qwaylandxdgoutputv1_p.h | 27 +++++++------------
|
|
|
ebefeac |
.../extensions/qwaylandxdgshell.cpp | 27 +++++++------------
|
|
|
ebefeac |
src/compositor/extensions/qwaylandxdgshell.h | 27 +++++++------------
|
|
|
ebefeac |
.../extensions/qwaylandxdgshell_p.h | 27 +++++++------------
|
|
|
ebefeac |
.../qwaylandxdgshellintegration.cpp | 27 +++++++------------
|
|
|
ebefeac |
.../qwaylandxdgshellintegration_p.h | 27 +++++++------------
|
|
|
ebefeac |
19 files changed, 190 insertions(+), 323 deletions(-)
|
|
|
ebefeac |
|
|
|
ebefeac |
diff --git a/src/compositor/extensions/qwaylandidleinhibitv1.cpp b/src/compositor/extensions/qwaylandidleinhibitv1.cpp
|
|
|
ebefeac |
index d034c47f..3d7e4d13 100644
|
|
|
ebefeac |
--- a/src/compositor/extensions/qwaylandidleinhibitv1.cpp
|
|
|
ebefeac |
+++ b/src/compositor/extensions/qwaylandidleinhibitv1.cpp
|
|
|
ebefeac |
@@ -1,34 +1,27 @@
|
|
|
ebefeac |
/****************************************************************************
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** Copyright (C) 2019 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
|
|
|
ebefeac |
-** Contact: http://www.qt.io/licensing/
|
|
|
ebefeac |
+** Contact: https://www.qt.io/licensing/
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
-** $QT_BEGIN_LICENSE:LGPL3$
|
|
|
ebefeac |
+** $QT_BEGIN_LICENSE:GPL$
|
|
|
ebefeac |
** Commercial License Usage
|
|
|
ebefeac |
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
ebefeac |
** accordance with the commercial license agreement provided with the
|
|
|
ebefeac |
** Software or, alternatively, in accordance with the terms contained in
|
|
|
ebefeac |
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
ebefeac |
-** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
-** information use the contact form at http://www.qt.io/contact-us.
|
|
|
ebefeac |
-**
|
|
|
ebefeac |
-** GNU Lesser General Public License Usage
|
|
|
ebefeac |
-** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
ebefeac |
-** General Public License version 3 as published by the Free Software
|
|
|
ebefeac |
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
|
|
ebefeac |
-** packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
ebefeac |
-** will be met: https://www.gnu.org/licenses/lgpl.html.
|
|
|
ebefeac |
+** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
+** information use the contact form at https://www.qt.io/contact-us.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** GNU General Public License Usage
|
|
|
ebefeac |
** Alternatively, this file may be used under the terms of the GNU
|
|
|
ebefeac |
-** General Public License version 2.0 or later as published by the Free
|
|
|
ebefeac |
-** Software Foundation and appearing in the file LICENSE.GPL included in
|
|
|
ebefeac |
-** the packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU General Public License version 2.0 requirements will be
|
|
|
ebefeac |
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
|
|
ebefeac |
+** General Public License version 3 or (at your option) any later version
|
|
|
ebefeac |
+** approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
|
ebefeac |
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
|
ebefeac |
+** included in the packaging of this file. Please review the following
|
|
|
ebefeac |
+** information to ensure the GNU General Public License requirements will
|
|
|
ebefeac |
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** $QT_END_LICENSE$
|
|
|
ebefeac |
**
|
|
|
ebefeac |
diff --git a/src/compositor/extensions/qwaylandidleinhibitv1.h b/src/compositor/extensions/qwaylandidleinhibitv1.h
|
|
|
ebefeac |
index 53c09d08..390ef9df 100644
|
|
|
ebefeac |
--- a/src/compositor/extensions/qwaylandidleinhibitv1.h
|
|
|
ebefeac |
+++ b/src/compositor/extensions/qwaylandidleinhibitv1.h
|
|
|
ebefeac |
@@ -1,34 +1,27 @@
|
|
|
ebefeac |
/****************************************************************************
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** Copyright (C) 2019 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
|
|
|
ebefeac |
-** Contact: http://www.qt.io/licensing/
|
|
|
ebefeac |
+** Contact: https://www.qt.io/licensing/
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
-** $QT_BEGIN_LICENSE:LGPL3$
|
|
|
ebefeac |
+** $QT_BEGIN_LICENSE:GPL$
|
|
|
ebefeac |
** Commercial License Usage
|
|
|
ebefeac |
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
ebefeac |
** accordance with the commercial license agreement provided with the
|
|
|
ebefeac |
** Software or, alternatively, in accordance with the terms contained in
|
|
|
ebefeac |
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
ebefeac |
-** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
-** information use the contact form at http://www.qt.io/contact-us.
|
|
|
ebefeac |
-**
|
|
|
ebefeac |
-** GNU Lesser General Public License Usage
|
|
|
ebefeac |
-** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
ebefeac |
-** General Public License version 3 as published by the Free Software
|
|
|
ebefeac |
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
|
|
ebefeac |
-** packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
ebefeac |
-** will be met: https://www.gnu.org/licenses/lgpl.html.
|
|
|
ebefeac |
+** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
+** information use the contact form at https://www.qt.io/contact-us.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** GNU General Public License Usage
|
|
|
ebefeac |
** Alternatively, this file may be used under the terms of the GNU
|
|
|
ebefeac |
-** General Public License version 2.0 or later as published by the Free
|
|
|
ebefeac |
-** Software Foundation and appearing in the file LICENSE.GPL included in
|
|
|
ebefeac |
-** the packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU General Public License version 2.0 requirements will be
|
|
|
ebefeac |
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
|
|
ebefeac |
+** General Public License version 3 or (at your option) any later version
|
|
|
ebefeac |
+** approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
|
ebefeac |
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
|
ebefeac |
+** included in the packaging of this file. Please review the following
|
|
|
ebefeac |
+** information to ensure the GNU General Public License requirements will
|
|
|
ebefeac |
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** $QT_END_LICENSE$
|
|
|
ebefeac |
**
|
|
|
ebefeac |
diff --git a/src/compositor/extensions/qwaylandidleinhibitv1_p.h b/src/compositor/extensions/qwaylandidleinhibitv1_p.h
|
|
|
ebefeac |
index 38055180..a87fa871 100644
|
|
|
ebefeac |
--- a/src/compositor/extensions/qwaylandidleinhibitv1_p.h
|
|
|
ebefeac |
+++ b/src/compositor/extensions/qwaylandidleinhibitv1_p.h
|
|
|
ebefeac |
@@ -1,34 +1,27 @@
|
|
|
ebefeac |
/****************************************************************************
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** Copyright (C) 2019 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
|
|
|
ebefeac |
-** Contact: http://www.qt.io/licensing/
|
|
|
ebefeac |
+** Contact: https://www.qt.io/licensing/
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
-** $QT_BEGIN_LICENSE:LGPL3$
|
|
|
ebefeac |
+** $QT_BEGIN_LICENSE:GPL$
|
|
|
ebefeac |
** Commercial License Usage
|
|
|
ebefeac |
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
ebefeac |
** accordance with the commercial license agreement provided with the
|
|
|
ebefeac |
** Software or, alternatively, in accordance with the terms contained in
|
|
|
ebefeac |
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
ebefeac |
-** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
-** information use the contact form at http://www.qt.io/contact-us.
|
|
|
ebefeac |
-**
|
|
|
ebefeac |
-** GNU Lesser General Public License Usage
|
|
|
ebefeac |
-** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
ebefeac |
-** General Public License version 3 as published by the Free Software
|
|
|
ebefeac |
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
|
|
ebefeac |
-** packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
ebefeac |
-** will be met: https://www.gnu.org/licenses/lgpl.html.
|
|
|
ebefeac |
+** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
+** information use the contact form at https://www.qt.io/contact-us.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** GNU General Public License Usage
|
|
|
ebefeac |
** Alternatively, this file may be used under the terms of the GNU
|
|
|
ebefeac |
-** General Public License version 2.0 or later as published by the Free
|
|
|
ebefeac |
-** Software Foundation and appearing in the file LICENSE.GPL included in
|
|
|
ebefeac |
-** the packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU General Public License version 2.0 requirements will be
|
|
|
ebefeac |
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
|
|
ebefeac |
+** General Public License version 3 or (at your option) any later version
|
|
|
ebefeac |
+** approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
|
ebefeac |
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
|
ebefeac |
+** included in the packaging of this file. Please review the following
|
|
|
ebefeac |
+** information to ensure the GNU General Public License requirements will
|
|
|
ebefeac |
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** $QT_END_LICENSE$
|
|
|
ebefeac |
**
|
|
|
ebefeac |
diff --git a/src/compositor/extensions/qwaylandquickxdgoutputv1.cpp b/src/compositor/extensions/qwaylandquickxdgoutputv1.cpp
|
|
|
ebefeac |
index eb6717a7..b61cc490 100644
|
|
|
ebefeac |
--- a/src/compositor/extensions/qwaylandquickxdgoutputv1.cpp
|
|
|
ebefeac |
+++ b/src/compositor/extensions/qwaylandquickxdgoutputv1.cpp
|
|
|
ebefeac |
@@ -1,34 +1,27 @@
|
|
|
ebefeac |
/****************************************************************************
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** Copyright (C) 2019 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
|
|
|
ebefeac |
-** Contact: http://www.qt.io/licensing/
|
|
|
ebefeac |
+** Contact: https://www.qt.io/licensing/
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
-** $QT_BEGIN_LICENSE:LGPL3$
|
|
|
ebefeac |
+** $QT_BEGIN_LICENSE:GPL$
|
|
|
ebefeac |
** Commercial License Usage
|
|
|
ebefeac |
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
ebefeac |
** accordance with the commercial license agreement provided with the
|
|
|
ebefeac |
** Software or, alternatively, in accordance with the terms contained in
|
|
|
ebefeac |
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
ebefeac |
-** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
-** information use the contact form at http://www.qt.io/contact-us.
|
|
|
ebefeac |
-**
|
|
|
ebefeac |
-** GNU Lesser General Public License Usage
|
|
|
ebefeac |
-** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
ebefeac |
-** General Public License version 3 as published by the Free Software
|
|
|
ebefeac |
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
|
|
ebefeac |
-** packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
ebefeac |
-** will be met: https://www.gnu.org/licenses/lgpl.html.
|
|
|
ebefeac |
+** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
+** information use the contact form at https://www.qt.io/contact-us.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** GNU General Public License Usage
|
|
|
ebefeac |
** Alternatively, this file may be used under the terms of the GNU
|
|
|
ebefeac |
-** General Public License version 2.0 or later as published by the Free
|
|
|
ebefeac |
-** Software Foundation and appearing in the file LICENSE.GPL included in
|
|
|
ebefeac |
-** the packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU General Public License version 2.0 requirements will be
|
|
|
ebefeac |
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
|
|
ebefeac |
+** General Public License version 3 or (at your option) any later version
|
|
|
ebefeac |
+** approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
|
ebefeac |
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
|
ebefeac |
+** included in the packaging of this file. Please review the following
|
|
|
ebefeac |
+** information to ensure the GNU General Public License requirements will
|
|
|
ebefeac |
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** $QT_END_LICENSE$
|
|
|
ebefeac |
**
|
|
|
ebefeac |
diff --git a/src/compositor/extensions/qwaylandquickxdgoutputv1.h b/src/compositor/extensions/qwaylandquickxdgoutputv1.h
|
|
|
ebefeac |
index c8b16ab8..d6701cc8 100644
|
|
|
ebefeac |
--- a/src/compositor/extensions/qwaylandquickxdgoutputv1.h
|
|
|
ebefeac |
+++ b/src/compositor/extensions/qwaylandquickxdgoutputv1.h
|
|
|
ebefeac |
@@ -1,34 +1,27 @@
|
|
|
ebefeac |
/****************************************************************************
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** Copyright (C) 2019 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
|
|
|
ebefeac |
-** Contact: http://www.qt.io/licensing/
|
|
|
ebefeac |
+** Contact: https://www.qt.io/licensing/
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
-** $QT_BEGIN_LICENSE:LGPL3$
|
|
|
ebefeac |
+** $QT_BEGIN_LICENSE:GPL$
|
|
|
ebefeac |
** Commercial License Usage
|
|
|
ebefeac |
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
ebefeac |
** accordance with the commercial license agreement provided with the
|
|
|
ebefeac |
** Software or, alternatively, in accordance with the terms contained in
|
|
|
ebefeac |
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
ebefeac |
-** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
-** information use the contact form at http://www.qt.io/contact-us.
|
|
|
ebefeac |
-**
|
|
|
ebefeac |
-** GNU Lesser General Public License Usage
|
|
|
ebefeac |
-** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
ebefeac |
-** General Public License version 3 as published by the Free Software
|
|
|
ebefeac |
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
|
|
ebefeac |
-** packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
ebefeac |
-** will be met: https://www.gnu.org/licenses/lgpl.html.
|
|
|
ebefeac |
+** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
+** information use the contact form at https://www.qt.io/contact-us.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** GNU General Public License Usage
|
|
|
ebefeac |
** Alternatively, this file may be used under the terms of the GNU
|
|
|
ebefeac |
-** General Public License version 2.0 or later as published by the Free
|
|
|
ebefeac |
-** Software Foundation and appearing in the file LICENSE.GPL included in
|
|
|
ebefeac |
-** the packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU General Public License version 2.0 requirements will be
|
|
|
ebefeac |
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
|
|
ebefeac |
+** General Public License version 3 or (at your option) any later version
|
|
|
ebefeac |
+** approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
|
ebefeac |
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
|
ebefeac |
+** included in the packaging of this file. Please review the following
|
|
|
ebefeac |
+** information to ensure the GNU General Public License requirements will
|
|
|
ebefeac |
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** $QT_END_LICENSE$
|
|
|
ebefeac |
**
|
|
|
ebefeac |
diff --git a/src/compositor/extensions/qwaylandviewporter.cpp b/src/compositor/extensions/qwaylandviewporter.cpp
|
|
|
ebefeac |
index 3856c135..b98274b1 100644
|
|
|
ebefeac |
--- a/src/compositor/extensions/qwaylandviewporter.cpp
|
|
|
ebefeac |
+++ b/src/compositor/extensions/qwaylandviewporter.cpp
|
|
|
ebefeac |
@@ -1,34 +1,27 @@
|
|
|
ebefeac |
/****************************************************************************
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** Copyright (C) 2018 The Qt Company Ltd.
|
|
|
ebefeac |
-** Contact: http://www.qt.io/licensing/
|
|
|
ebefeac |
+** Contact: https://www.qt.io/licensing/
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
-** $QT_BEGIN_LICENSE:LGPL3$
|
|
|
ebefeac |
+** $QT_BEGIN_LICENSE:GPL$
|
|
|
ebefeac |
** Commercial License Usage
|
|
|
ebefeac |
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
ebefeac |
** accordance with the commercial license agreement provided with the
|
|
|
ebefeac |
** Software or, alternatively, in accordance with the terms contained in
|
|
|
ebefeac |
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
ebefeac |
-** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
-** information use the contact form at http://www.qt.io/contact-us.
|
|
|
ebefeac |
-**
|
|
|
ebefeac |
-** GNU Lesser General Public License Usage
|
|
|
ebefeac |
-** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
ebefeac |
-** General Public License version 3 as published by the Free Software
|
|
|
ebefeac |
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
|
|
ebefeac |
-** packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
ebefeac |
-** will be met: https://www.gnu.org/licenses/lgpl.html.
|
|
|
ebefeac |
+** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
+** information use the contact form at https://www.qt.io/contact-us.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** GNU General Public License Usage
|
|
|
ebefeac |
** Alternatively, this file may be used under the terms of the GNU
|
|
|
ebefeac |
-** General Public License version 2.0 or later as published by the Free
|
|
|
ebefeac |
-** Software Foundation and appearing in the file LICENSE.GPL included in
|
|
|
ebefeac |
-** the packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU General Public License version 2.0 requirements will be
|
|
|
ebefeac |
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
|
|
ebefeac |
+** General Public License version 3 or (at your option) any later version
|
|
|
ebefeac |
+** approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
|
ebefeac |
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
|
ebefeac |
+** included in the packaging of this file. Please review the following
|
|
|
ebefeac |
+** information to ensure the GNU General Public License requirements will
|
|
|
ebefeac |
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** $QT_END_LICENSE$
|
|
|
ebefeac |
**
|
|
|
ebefeac |
diff --git a/src/compositor/extensions/qwaylandviewporter.h b/src/compositor/extensions/qwaylandviewporter.h
|
|
|
ebefeac |
index 811c7414..fb640a49 100644
|
|
|
ebefeac |
--- a/src/compositor/extensions/qwaylandviewporter.h
|
|
|
ebefeac |
+++ b/src/compositor/extensions/qwaylandviewporter.h
|
|
|
ebefeac |
@@ -1,34 +1,27 @@
|
|
|
ebefeac |
/****************************************************************************
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** Copyright (C) 2018 The Qt Company Ltd.
|
|
|
ebefeac |
-** Contact: http://www.qt.io/licensing/
|
|
|
ebefeac |
+** Contact: https://www.qt.io/licensing/
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
-** $QT_BEGIN_LICENSE:LGPL3$
|
|
|
ebefeac |
+** $QT_BEGIN_LICENSE:GPL$
|
|
|
ebefeac |
** Commercial License Usage
|
|
|
ebefeac |
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
ebefeac |
** accordance with the commercial license agreement provided with the
|
|
|
ebefeac |
** Software or, alternatively, in accordance with the terms contained in
|
|
|
ebefeac |
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
ebefeac |
-** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
-** information use the contact form at http://www.qt.io/contact-us.
|
|
|
ebefeac |
-**
|
|
|
ebefeac |
-** GNU Lesser General Public License Usage
|
|
|
ebefeac |
-** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
ebefeac |
-** General Public License version 3 as published by the Free Software
|
|
|
ebefeac |
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
|
|
ebefeac |
-** packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
ebefeac |
-** will be met: https://www.gnu.org/licenses/lgpl.html.
|
|
|
ebefeac |
+** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
+** information use the contact form at https://www.qt.io/contact-us.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** GNU General Public License Usage
|
|
|
ebefeac |
** Alternatively, this file may be used under the terms of the GNU
|
|
|
ebefeac |
-** General Public License version 2.0 or later as published by the Free
|
|
|
ebefeac |
-** Software Foundation and appearing in the file LICENSE.GPL included in
|
|
|
ebefeac |
-** the packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU General Public License version 2.0 requirements will be
|
|
|
ebefeac |
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
|
|
ebefeac |
+** General Public License version 3 or (at your option) any later version
|
|
|
ebefeac |
+** approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
|
ebefeac |
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
|
ebefeac |
+** included in the packaging of this file. Please review the following
|
|
|
ebefeac |
+** information to ensure the GNU General Public License requirements will
|
|
|
ebefeac |
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** $QT_END_LICENSE$
|
|
|
ebefeac |
**
|
|
|
ebefeac |
diff --git a/src/compositor/extensions/qwaylandviewporter_p.h b/src/compositor/extensions/qwaylandviewporter_p.h
|
|
|
ebefeac |
index d22da699..bf9e197a 100644
|
|
|
ebefeac |
--- a/src/compositor/extensions/qwaylandviewporter_p.h
|
|
|
ebefeac |
+++ b/src/compositor/extensions/qwaylandviewporter_p.h
|
|
|
ebefeac |
@@ -1,34 +1,27 @@
|
|
|
ebefeac |
/****************************************************************************
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** Copyright (C) 2018 The Qt Company Ltd.
|
|
|
ebefeac |
-** Contact: http://www.qt.io/licensing/
|
|
|
ebefeac |
+** Contact: https://www.qt.io/licensing/
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
-** $QT_BEGIN_LICENSE:LGPL3$
|
|
|
ebefeac |
+** $QT_BEGIN_LICENSE:GPL$
|
|
|
ebefeac |
** Commercial License Usage
|
|
|
ebefeac |
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
ebefeac |
** accordance with the commercial license agreement provided with the
|
|
|
ebefeac |
** Software or, alternatively, in accordance with the terms contained in
|
|
|
ebefeac |
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
ebefeac |
-** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
-** information use the contact form at http://www.qt.io/contact-us.
|
|
|
ebefeac |
-**
|
|
|
ebefeac |
-** GNU Lesser General Public License Usage
|
|
|
ebefeac |
-** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
ebefeac |
-** General Public License version 3 as published by the Free Software
|
|
|
ebefeac |
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
|
|
ebefeac |
-** packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
ebefeac |
-** will be met: https://www.gnu.org/licenses/lgpl.html.
|
|
|
ebefeac |
+** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
+** information use the contact form at https://www.qt.io/contact-us.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** GNU General Public License Usage
|
|
|
ebefeac |
** Alternatively, this file may be used under the terms of the GNU
|
|
|
ebefeac |
-** General Public License version 2.0 or later as published by the Free
|
|
|
ebefeac |
-** Software Foundation and appearing in the file LICENSE.GPL included in
|
|
|
ebefeac |
-** the packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU General Public License version 2.0 requirements will be
|
|
|
ebefeac |
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
|
|
ebefeac |
+** General Public License version 3 or (at your option) any later version
|
|
|
ebefeac |
+** approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
|
ebefeac |
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
|
ebefeac |
+** included in the packaging of this file. Please review the following
|
|
|
ebefeac |
+** information to ensure the GNU General Public License requirements will
|
|
|
ebefeac |
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** $QT_END_LICENSE$
|
|
|
ebefeac |
**
|
|
|
ebefeac |
diff --git a/src/compositor/extensions/qwaylandxdgdecorationv1.cpp b/src/compositor/extensions/qwaylandxdgdecorationv1.cpp
|
|
|
ebefeac |
index a58601cd..9fb2c955 100644
|
|
|
ebefeac |
--- a/src/compositor/extensions/qwaylandxdgdecorationv1.cpp
|
|
|
ebefeac |
+++ b/src/compositor/extensions/qwaylandxdgdecorationv1.cpp
|
|
|
ebefeac |
@@ -1,34 +1,27 @@
|
|
|
ebefeac |
/****************************************************************************
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** Copyright (C) 2018 The Qt Company Ltd.
|
|
|
ebefeac |
-** Contact: http://www.qt.io/licensing/
|
|
|
ebefeac |
+** Contact: https://www.qt.io/licensing/
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
-** $QT_BEGIN_LICENSE:LGPL3$
|
|
|
ebefeac |
+** $QT_BEGIN_LICENSE:GPL$
|
|
|
ebefeac |
** Commercial License Usage
|
|
|
ebefeac |
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
ebefeac |
** accordance with the commercial license agreement provided with the
|
|
|
ebefeac |
** Software or, alternatively, in accordance with the terms contained in
|
|
|
ebefeac |
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
ebefeac |
-** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
-** information use the contact form at http://www.qt.io/contact-us.
|
|
|
ebefeac |
-**
|
|
|
ebefeac |
-** GNU Lesser General Public License Usage
|
|
|
ebefeac |
-** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
ebefeac |
-** General Public License version 3 as published by the Free Software
|
|
|
ebefeac |
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
|
|
ebefeac |
-** packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
ebefeac |
-** will be met: https://www.gnu.org/licenses/lgpl.html.
|
|
|
ebefeac |
+** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
+** information use the contact form at https://www.qt.io/contact-us.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** GNU General Public License Usage
|
|
|
ebefeac |
** Alternatively, this file may be used under the terms of the GNU
|
|
|
ebefeac |
-** General Public License version 2.0 or later as published by the Free
|
|
|
ebefeac |
-** Software Foundation and appearing in the file LICENSE.GPL included in
|
|
|
ebefeac |
-** the packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU General Public License version 2.0 requirements will be
|
|
|
ebefeac |
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
|
|
ebefeac |
+** General Public License version 3 or (at your option) any later version
|
|
|
ebefeac |
+** approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
|
ebefeac |
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
|
ebefeac |
+** included in the packaging of this file. Please review the following
|
|
|
ebefeac |
+** information to ensure the GNU General Public License requirements will
|
|
|
ebefeac |
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** $QT_END_LICENSE$
|
|
|
ebefeac |
**
|
|
|
ebefeac |
diff --git a/src/compositor/extensions/qwaylandxdgdecorationv1.h b/src/compositor/extensions/qwaylandxdgdecorationv1.h
|
|
|
ebefeac |
index 4390716e..7b39091f 100644
|
|
|
ebefeac |
--- a/src/compositor/extensions/qwaylandxdgdecorationv1.h
|
|
|
ebefeac |
+++ b/src/compositor/extensions/qwaylandxdgdecorationv1.h
|
|
|
ebefeac |
@@ -1,34 +1,27 @@
|
|
|
ebefeac |
/****************************************************************************
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** Copyright (C) 2018 The Qt Company Ltd.
|
|
|
ebefeac |
-** Contact: http://www.qt.io/licensing/
|
|
|
ebefeac |
+** Contact: https://www.qt.io/licensing/
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
-** $QT_BEGIN_LICENSE:LGPL3$
|
|
|
ebefeac |
+** $QT_BEGIN_LICENSE:GPL$
|
|
|
ebefeac |
** Commercial License Usage
|
|
|
ebefeac |
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
ebefeac |
** accordance with the commercial license agreement provided with the
|
|
|
ebefeac |
** Software or, alternatively, in accordance with the terms contained in
|
|
|
ebefeac |
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
ebefeac |
-** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
-** information use the contact form at http://www.qt.io/contact-us.
|
|
|
ebefeac |
-**
|
|
|
ebefeac |
-** GNU Lesser General Public License Usage
|
|
|
ebefeac |
-** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
ebefeac |
-** General Public License version 3 as published by the Free Software
|
|
|
ebefeac |
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
|
|
ebefeac |
-** packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
ebefeac |
-** will be met: https://www.gnu.org/licenses/lgpl.html.
|
|
|
ebefeac |
+** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
+** information use the contact form at https://www.qt.io/contact-us.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** GNU General Public License Usage
|
|
|
ebefeac |
** Alternatively, this file may be used under the terms of the GNU
|
|
|
ebefeac |
-** General Public License version 2.0 or later as published by the Free
|
|
|
ebefeac |
-** Software Foundation and appearing in the file LICENSE.GPL included in
|
|
|
ebefeac |
-** the packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU General Public License version 2.0 requirements will be
|
|
|
ebefeac |
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
|
|
ebefeac |
+** General Public License version 3 or (at your option) any later version
|
|
|
ebefeac |
+** approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
|
ebefeac |
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
|
ebefeac |
+** included in the packaging of this file. Please review the following
|
|
|
ebefeac |
+** information to ensure the GNU General Public License requirements will
|
|
|
ebefeac |
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** $QT_END_LICENSE$
|
|
|
ebefeac |
**
|
|
|
ebefeac |
diff --git a/src/compositor/extensions/qwaylandxdgdecorationv1_p.h b/src/compositor/extensions/qwaylandxdgdecorationv1_p.h
|
|
|
ebefeac |
index fdd555ab..cd9c38c2 100644
|
|
|
ebefeac |
--- a/src/compositor/extensions/qwaylandxdgdecorationv1_p.h
|
|
|
ebefeac |
+++ b/src/compositor/extensions/qwaylandxdgdecorationv1_p.h
|
|
|
ebefeac |
@@ -1,34 +1,27 @@
|
|
|
ebefeac |
/****************************************************************************
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** Copyright (C) 2018 The Qt Company Ltd.
|
|
|
ebefeac |
-** Contact: http://www.qt.io/licensing/
|
|
|
ebefeac |
+** Contact: https://www.qt.io/licensing/
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
-** $QT_BEGIN_LICENSE:LGPL3$
|
|
|
ebefeac |
+** $QT_BEGIN_LICENSE:GPL$
|
|
|
ebefeac |
** Commercial License Usage
|
|
|
ebefeac |
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
ebefeac |
** accordance with the commercial license agreement provided with the
|
|
|
ebefeac |
** Software or, alternatively, in accordance with the terms contained in
|
|
|
ebefeac |
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
ebefeac |
-** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
-** information use the contact form at http://www.qt.io/contact-us.
|
|
|
ebefeac |
-**
|
|
|
ebefeac |
-** GNU Lesser General Public License Usage
|
|
|
ebefeac |
-** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
ebefeac |
-** General Public License version 3 as published by the Free Software
|
|
|
ebefeac |
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
|
|
ebefeac |
-** packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
ebefeac |
-** will be met: https://www.gnu.org/licenses/lgpl.html.
|
|
|
ebefeac |
+** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
+** information use the contact form at https://www.qt.io/contact-us.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** GNU General Public License Usage
|
|
|
ebefeac |
** Alternatively, this file may be used under the terms of the GNU
|
|
|
ebefeac |
-** General Public License version 2.0 or later as published by the Free
|
|
|
ebefeac |
-** Software Foundation and appearing in the file LICENSE.GPL included in
|
|
|
ebefeac |
-** the packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU General Public License version 2.0 requirements will be
|
|
|
ebefeac |
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
|
|
ebefeac |
+** General Public License version 3 or (at your option) any later version
|
|
|
ebefeac |
+** approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
|
ebefeac |
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
|
ebefeac |
+** included in the packaging of this file. Please review the following
|
|
|
ebefeac |
+** information to ensure the GNU General Public License requirements will
|
|
|
ebefeac |
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** $QT_END_LICENSE$
|
|
|
ebefeac |
**
|
|
|
ebefeac |
diff --git a/src/compositor/extensions/qwaylandxdgoutputv1.cpp b/src/compositor/extensions/qwaylandxdgoutputv1.cpp
|
|
|
ebefeac |
index 817cb2e4..a78a9f62 100644
|
|
|
ebefeac |
--- a/src/compositor/extensions/qwaylandxdgoutputv1.cpp
|
|
|
ebefeac |
+++ b/src/compositor/extensions/qwaylandxdgoutputv1.cpp
|
|
|
ebefeac |
@@ -1,34 +1,27 @@
|
|
|
ebefeac |
/****************************************************************************
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** Copyright (C) 2019 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
|
|
|
ebefeac |
-** Contact: http://www.qt.io/licensing/
|
|
|
ebefeac |
+** Contact: https://www.qt.io/licensing/
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
-** $QT_BEGIN_LICENSE:LGPL3$
|
|
|
ebefeac |
+** $QT_BEGIN_LICENSE:GPL$
|
|
|
ebefeac |
** Commercial License Usage
|
|
|
ebefeac |
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
ebefeac |
** accordance with the commercial license agreement provided with the
|
|
|
ebefeac |
** Software or, alternatively, in accordance with the terms contained in
|
|
|
ebefeac |
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
ebefeac |
-** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
-** information use the contact form at http://www.qt.io/contact-us.
|
|
|
ebefeac |
-**
|
|
|
ebefeac |
-** GNU Lesser General Public License Usage
|
|
|
ebefeac |
-** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
ebefeac |
-** General Public License version 3 as published by the Free Software
|
|
|
ebefeac |
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
|
|
ebefeac |
-** packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
ebefeac |
-** will be met: https://www.gnu.org/licenses/lgpl.html.
|
|
|
ebefeac |
+** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
+** information use the contact form at https://www.qt.io/contact-us.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** GNU General Public License Usage
|
|
|
ebefeac |
** Alternatively, this file may be used under the terms of the GNU
|
|
|
ebefeac |
-** General Public License version 2.0 or later as published by the Free
|
|
|
ebefeac |
-** Software Foundation and appearing in the file LICENSE.GPL included in
|
|
|
ebefeac |
-** the packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU General Public License version 2.0 requirements will be
|
|
|
ebefeac |
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
|
|
ebefeac |
+** General Public License version 3 or (at your option) any later version
|
|
|
ebefeac |
+** approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
|
ebefeac |
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
|
ebefeac |
+** included in the packaging of this file. Please review the following
|
|
|
ebefeac |
+** information to ensure the GNU General Public License requirements will
|
|
|
ebefeac |
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** $QT_END_LICENSE$
|
|
|
ebefeac |
**
|
|
|
ebefeac |
diff --git a/src/compositor/extensions/qwaylandxdgoutputv1.h b/src/compositor/extensions/qwaylandxdgoutputv1.h
|
|
|
ebefeac |
index 957ac3be..e86fb405 100644
|
|
|
ebefeac |
--- a/src/compositor/extensions/qwaylandxdgoutputv1.h
|
|
|
ebefeac |
+++ b/src/compositor/extensions/qwaylandxdgoutputv1.h
|
|
|
ebefeac |
@@ -1,34 +1,27 @@
|
|
|
ebefeac |
/****************************************************************************
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** Copyright (C) 2019 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
|
|
|
ebefeac |
-** Contact: http://www.qt.io/licensing/
|
|
|
ebefeac |
+** Contact: https://www.qt.io/licensing/
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
-** $QT_BEGIN_LICENSE:LGPL3$
|
|
|
ebefeac |
+** $QT_BEGIN_LICENSE:GPL$
|
|
|
ebefeac |
** Commercial License Usage
|
|
|
ebefeac |
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
ebefeac |
** accordance with the commercial license agreement provided with the
|
|
|
ebefeac |
** Software or, alternatively, in accordance with the terms contained in
|
|
|
ebefeac |
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
ebefeac |
-** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
-** information use the contact form at http://www.qt.io/contact-us.
|
|
|
ebefeac |
-**
|
|
|
ebefeac |
-** GNU Lesser General Public License Usage
|
|
|
ebefeac |
-** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
ebefeac |
-** General Public License version 3 as published by the Free Software
|
|
|
ebefeac |
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
|
|
ebefeac |
-** packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
ebefeac |
-** will be met: https://www.gnu.org/licenses/lgpl.html.
|
|
|
ebefeac |
+** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
+** information use the contact form at https://www.qt.io/contact-us.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** GNU General Public License Usage
|
|
|
ebefeac |
** Alternatively, this file may be used under the terms of the GNU
|
|
|
ebefeac |
-** General Public License version 2.0 or later as published by the Free
|
|
|
ebefeac |
-** Software Foundation and appearing in the file LICENSE.GPL included in
|
|
|
ebefeac |
-** the packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU General Public License version 2.0 requirements will be
|
|
|
ebefeac |
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
|
|
ebefeac |
+** General Public License version 3 or (at your option) any later version
|
|
|
ebefeac |
+** approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
|
ebefeac |
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
|
ebefeac |
+** included in the packaging of this file. Please review the following
|
|
|
ebefeac |
+** information to ensure the GNU General Public License requirements will
|
|
|
ebefeac |
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** $QT_END_LICENSE$
|
|
|
ebefeac |
**
|
|
|
ebefeac |
diff --git a/src/compositor/extensions/qwaylandxdgoutputv1_p.h b/src/compositor/extensions/qwaylandxdgoutputv1_p.h
|
|
|
ebefeac |
index 2e8a6fff..ab08f5d4 100644
|
|
|
ebefeac |
--- a/src/compositor/extensions/qwaylandxdgoutputv1_p.h
|
|
|
ebefeac |
+++ b/src/compositor/extensions/qwaylandxdgoutputv1_p.h
|
|
|
ebefeac |
@@ -1,34 +1,27 @@
|
|
|
ebefeac |
/****************************************************************************
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** Copyright (C) 2019 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
|
|
|
ebefeac |
-** Contact: http://www.qt.io/licensing/
|
|
|
ebefeac |
+** Contact: https://www.qt.io/licensing/
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
-** $QT_BEGIN_LICENSE:LGPL3$
|
|
|
ebefeac |
+** $QT_BEGIN_LICENSE:GPL$
|
|
|
ebefeac |
** Commercial License Usage
|
|
|
ebefeac |
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
ebefeac |
** accordance with the commercial license agreement provided with the
|
|
|
ebefeac |
** Software or, alternatively, in accordance with the terms contained in
|
|
|
ebefeac |
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
ebefeac |
-** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
-** information use the contact form at http://www.qt.io/contact-us.
|
|
|
ebefeac |
-**
|
|
|
ebefeac |
-** GNU Lesser General Public License Usage
|
|
|
ebefeac |
-** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
ebefeac |
-** General Public License version 3 as published by the Free Software
|
|
|
ebefeac |
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
|
|
ebefeac |
-** packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
ebefeac |
-** will be met: https://www.gnu.org/licenses/lgpl.html.
|
|
|
ebefeac |
+** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
+** information use the contact form at https://www.qt.io/contact-us.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** GNU General Public License Usage
|
|
|
ebefeac |
** Alternatively, this file may be used under the terms of the GNU
|
|
|
ebefeac |
-** General Public License version 2.0 or later as published by the Free
|
|
|
ebefeac |
-** Software Foundation and appearing in the file LICENSE.GPL included in
|
|
|
ebefeac |
-** the packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU General Public License version 2.0 requirements will be
|
|
|
ebefeac |
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
|
|
ebefeac |
+** General Public License version 3 or (at your option) any later version
|
|
|
ebefeac |
+** approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
|
ebefeac |
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
|
ebefeac |
+** included in the packaging of this file. Please review the following
|
|
|
ebefeac |
+** information to ensure the GNU General Public License requirements will
|
|
|
ebefeac |
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** $QT_END_LICENSE$
|
|
|
ebefeac |
**
|
|
|
ebefeac |
diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp
|
|
|
ebefeac |
index 6b7e8600..e1888529 100644
|
|
|
ebefeac |
--- a/src/compositor/extensions/qwaylandxdgshell.cpp
|
|
|
ebefeac |
+++ b/src/compositor/extensions/qwaylandxdgshell.cpp
|
|
|
ebefeac |
@@ -1,34 +1,27 @@
|
|
|
ebefeac |
/****************************************************************************
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** Copyright (C) 2018 The Qt Company Ltd.
|
|
|
ebefeac |
-** Contact: http://www.qt.io/licensing/
|
|
|
ebefeac |
+** Contact: https://www.qt.io/licensing/
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
-** $QT_BEGIN_LICENSE:LGPL3$
|
|
|
ebefeac |
+** $QT_BEGIN_LICENSE:GPL$
|
|
|
ebefeac |
** Commercial License Usage
|
|
|
ebefeac |
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
ebefeac |
** accordance with the commercial license agreement provided with the
|
|
|
ebefeac |
** Software or, alternatively, in accordance with the terms contained in
|
|
|
ebefeac |
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
ebefeac |
-** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
-** information use the contact form at http://www.qt.io/contact-us.
|
|
|
ebefeac |
-**
|
|
|
ebefeac |
-** GNU Lesser General Public License Usage
|
|
|
ebefeac |
-** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
ebefeac |
-** General Public License version 3 as published by the Free Software
|
|
|
ebefeac |
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
|
|
ebefeac |
-** packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
ebefeac |
-** will be met: https://www.gnu.org/licenses/lgpl.html.
|
|
|
ebefeac |
+** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
+** information use the contact form at https://www.qt.io/contact-us.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** GNU General Public License Usage
|
|
|
ebefeac |
** Alternatively, this file may be used under the terms of the GNU
|
|
|
ebefeac |
-** General Public License version 2.0 or later as published by the Free
|
|
|
ebefeac |
-** Software Foundation and appearing in the file LICENSE.GPL included in
|
|
|
ebefeac |
-** the packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU General Public License version 2.0 requirements will be
|
|
|
ebefeac |
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
|
|
ebefeac |
+** General Public License version 3 or (at your option) any later version
|
|
|
ebefeac |
+** approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
|
ebefeac |
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
|
ebefeac |
+** included in the packaging of this file. Please review the following
|
|
|
ebefeac |
+** information to ensure the GNU General Public License requirements will
|
|
|
ebefeac |
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** $QT_END_LICENSE$
|
|
|
ebefeac |
**
|
|
|
ebefeac |
diff --git a/src/compositor/extensions/qwaylandxdgshell.h b/src/compositor/extensions/qwaylandxdgshell.h
|
|
|
ebefeac |
index 0535f8e4..ae3be8d0 100644
|
|
|
ebefeac |
--- a/src/compositor/extensions/qwaylandxdgshell.h
|
|
|
ebefeac |
+++ b/src/compositor/extensions/qwaylandxdgshell.h
|
|
|
ebefeac |
@@ -1,34 +1,27 @@
|
|
|
ebefeac |
/****************************************************************************
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** Copyright (C) 2018 The Qt Company Ltd.
|
|
|
ebefeac |
-** Contact: http://www.qt.io/licensing/
|
|
|
ebefeac |
+** Contact: https://www.qt.io/licensing/
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
-** $QT_BEGIN_LICENSE:LGPL3$
|
|
|
ebefeac |
+** $QT_BEGIN_LICENSE:GPL$
|
|
|
ebefeac |
** Commercial License Usage
|
|
|
ebefeac |
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
ebefeac |
** accordance with the commercial license agreement provided with the
|
|
|
ebefeac |
** Software or, alternatively, in accordance with the terms contained in
|
|
|
ebefeac |
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
ebefeac |
-** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
-** information use the contact form at http://www.qt.io/contact-us.
|
|
|
ebefeac |
-**
|
|
|
ebefeac |
-** GNU Lesser General Public License Usage
|
|
|
ebefeac |
-** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
ebefeac |
-** General Public License version 3 as published by the Free Software
|
|
|
ebefeac |
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
|
|
ebefeac |
-** packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
ebefeac |
-** will be met: https://www.gnu.org/licenses/lgpl.html.
|
|
|
ebefeac |
+** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
+** information use the contact form at https://www.qt.io/contact-us.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** GNU General Public License Usage
|
|
|
ebefeac |
** Alternatively, this file may be used under the terms of the GNU
|
|
|
ebefeac |
-** General Public License version 2.0 or later as published by the Free
|
|
|
ebefeac |
-** Software Foundation and appearing in the file LICENSE.GPL included in
|
|
|
ebefeac |
-** the packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU General Public License version 2.0 requirements will be
|
|
|
ebefeac |
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
|
|
ebefeac |
+** General Public License version 3 or (at your option) any later version
|
|
|
ebefeac |
+** approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
|
ebefeac |
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
|
ebefeac |
+** included in the packaging of this file. Please review the following
|
|
|
ebefeac |
+** information to ensure the GNU General Public License requirements will
|
|
|
ebefeac |
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** $QT_END_LICENSE$
|
|
|
ebefeac |
**
|
|
|
ebefeac |
diff --git a/src/compositor/extensions/qwaylandxdgshell_p.h b/src/compositor/extensions/qwaylandxdgshell_p.h
|
|
|
ebefeac |
index de48f481..0a0972ac 100644
|
|
|
ebefeac |
--- a/src/compositor/extensions/qwaylandxdgshell_p.h
|
|
|
ebefeac |
+++ b/src/compositor/extensions/qwaylandxdgshell_p.h
|
|
|
ebefeac |
@@ -1,34 +1,27 @@
|
|
|
ebefeac |
/****************************************************************************
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** Copyright (C) 2018 The Qt Company Ltd.
|
|
|
ebefeac |
-** Contact: http://www.qt.io/licensing/
|
|
|
ebefeac |
+** Contact: https://www.qt.io/licensing/
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
-** $QT_BEGIN_LICENSE:LGPL3$
|
|
|
ebefeac |
+** $QT_BEGIN_LICENSE:GPL$
|
|
|
ebefeac |
** Commercial License Usage
|
|
|
ebefeac |
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
ebefeac |
** accordance with the commercial license agreement provided with the
|
|
|
ebefeac |
** Software or, alternatively, in accordance with the terms contained in
|
|
|
ebefeac |
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
ebefeac |
-** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
-** information use the contact form at http://www.qt.io/contact-us.
|
|
|
ebefeac |
-**
|
|
|
ebefeac |
-** GNU Lesser General Public License Usage
|
|
|
ebefeac |
-** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
ebefeac |
-** General Public License version 3 as published by the Free Software
|
|
|
ebefeac |
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
|
|
ebefeac |
-** packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
ebefeac |
-** will be met: https://www.gnu.org/licenses/lgpl.html.
|
|
|
ebefeac |
+** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
+** information use the contact form at https://www.qt.io/contact-us.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** GNU General Public License Usage
|
|
|
ebefeac |
** Alternatively, this file may be used under the terms of the GNU
|
|
|
ebefeac |
-** General Public License version 2.0 or later as published by the Free
|
|
|
ebefeac |
-** Software Foundation and appearing in the file LICENSE.GPL included in
|
|
|
ebefeac |
-** the packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU General Public License version 2.0 requirements will be
|
|
|
ebefeac |
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
|
|
ebefeac |
+** General Public License version 3 or (at your option) any later version
|
|
|
ebefeac |
+** approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
|
ebefeac |
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
|
ebefeac |
+** included in the packaging of this file. Please review the following
|
|
|
ebefeac |
+** information to ensure the GNU General Public License requirements will
|
|
|
ebefeac |
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** $QT_END_LICENSE$
|
|
|
ebefeac |
**
|
|
|
ebefeac |
diff --git a/src/compositor/extensions/qwaylandxdgshellintegration.cpp b/src/compositor/extensions/qwaylandxdgshellintegration.cpp
|
|
|
ebefeac |
index 0aa16054..a30eb228 100644
|
|
|
ebefeac |
--- a/src/compositor/extensions/qwaylandxdgshellintegration.cpp
|
|
|
ebefeac |
+++ b/src/compositor/extensions/qwaylandxdgshellintegration.cpp
|
|
|
ebefeac |
@@ -1,34 +1,27 @@
|
|
|
ebefeac |
/****************************************************************************
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** Copyright (C) 2018 The Qt Company Ltd.
|
|
|
ebefeac |
-** Contact: http://www.qt.io/licensing/
|
|
|
ebefeac |
+** Contact: https://www.qt.io/licensing/
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
-** $QT_BEGIN_LICENSE:LGPL3$
|
|
|
ebefeac |
+** $QT_BEGIN_LICENSE:GPL$
|
|
|
ebefeac |
** Commercial License Usage
|
|
|
ebefeac |
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
ebefeac |
** accordance with the commercial license agreement provided with the
|
|
|
ebefeac |
** Software or, alternatively, in accordance with the terms contained in
|
|
|
ebefeac |
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
ebefeac |
-** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
-** information use the contact form at http://www.qt.io/contact-us.
|
|
|
ebefeac |
-**
|
|
|
ebefeac |
-** GNU Lesser General Public License Usage
|
|
|
ebefeac |
-** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
ebefeac |
-** General Public License version 3 as published by the Free Software
|
|
|
ebefeac |
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
|
|
ebefeac |
-** packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
ebefeac |
-** will be met: https://www.gnu.org/licenses/lgpl.html.
|
|
|
ebefeac |
+** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
+** information use the contact form at https://www.qt.io/contact-us.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** GNU General Public License Usage
|
|
|
ebefeac |
** Alternatively, this file may be used under the terms of the GNU
|
|
|
ebefeac |
-** General Public License version 2.0 or later as published by the Free
|
|
|
ebefeac |
-** Software Foundation and appearing in the file LICENSE.GPL included in
|
|
|
ebefeac |
-** the packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU General Public License version 2.0 requirements will be
|
|
|
ebefeac |
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
|
|
ebefeac |
+** General Public License version 3 or (at your option) any later version
|
|
|
ebefeac |
+** approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
|
ebefeac |
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
|
ebefeac |
+** included in the packaging of this file. Please review the following
|
|
|
ebefeac |
+** information to ensure the GNU General Public License requirements will
|
|
|
ebefeac |
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** $QT_END_LICENSE$
|
|
|
ebefeac |
**
|
|
|
ebefeac |
diff --git a/src/compositor/extensions/qwaylandxdgshellintegration_p.h b/src/compositor/extensions/qwaylandxdgshellintegration_p.h
|
|
|
ebefeac |
index cd6bad57..16bb3354 100644
|
|
|
ebefeac |
--- a/src/compositor/extensions/qwaylandxdgshellintegration_p.h
|
|
|
ebefeac |
+++ b/src/compositor/extensions/qwaylandxdgshellintegration_p.h
|
|
|
ebefeac |
@@ -1,34 +1,27 @@
|
|
|
ebefeac |
/****************************************************************************
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** Copyright (C) 2018 The Qt Company Ltd.
|
|
|
ebefeac |
-** Contact: http://www.qt.io/licensing/
|
|
|
ebefeac |
+** Contact: https://www.qt.io/licensing/
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
-** $QT_BEGIN_LICENSE:LGPL3$
|
|
|
ebefeac |
+** $QT_BEGIN_LICENSE:GPL$
|
|
|
ebefeac |
** Commercial License Usage
|
|
|
ebefeac |
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
ebefeac |
** accordance with the commercial license agreement provided with the
|
|
|
ebefeac |
** Software or, alternatively, in accordance with the terms contained in
|
|
|
ebefeac |
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
ebefeac |
-** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
-** information use the contact form at http://www.qt.io/contact-us.
|
|
|
ebefeac |
-**
|
|
|
ebefeac |
-** GNU Lesser General Public License Usage
|
|
|
ebefeac |
-** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
ebefeac |
-** General Public License version 3 as published by the Free Software
|
|
|
ebefeac |
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
|
|
ebefeac |
-** packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
ebefeac |
-** will be met: https://www.gnu.org/licenses/lgpl.html.
|
|
|
ebefeac |
+** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
ebefeac |
+** information use the contact form at https://www.qt.io/contact-us.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** GNU General Public License Usage
|
|
|
ebefeac |
** Alternatively, this file may be used under the terms of the GNU
|
|
|
ebefeac |
-** General Public License version 2.0 or later as published by the Free
|
|
|
ebefeac |
-** Software Foundation and appearing in the file LICENSE.GPL included in
|
|
|
ebefeac |
-** the packaging of this file. Please review the following information to
|
|
|
ebefeac |
-** ensure the GNU General Public License version 2.0 requirements will be
|
|
|
ebefeac |
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
|
|
ebefeac |
+** General Public License version 3 or (at your option) any later version
|
|
|
ebefeac |
+** approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
|
ebefeac |
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
|
ebefeac |
+** included in the packaging of this file. Please review the following
|
|
|
ebefeac |
+** information to ensure the GNU General Public License requirements will
|
|
|
ebefeac |
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
ebefeac |
**
|
|
|
ebefeac |
** $QT_END_LICENSE$
|
|
|
ebefeac |
**
|
|
|
ebefeac |
--
|
|
|
ebefeac |
2.31.1
|
|
|
ebefeac |
|