diff options
20 files changed, 97 insertions, 97 deletions
diff --git a/src/androidextras/android/qandroidactivitycallbackresultreceiver.cpp b/src/androidextras/android/qandroidactivitycallbackresultreceiver.cpp index d139130..428e07f 100644 --- a/src/androidextras/android/qandroidactivitycallbackresultreceiver.cpp +++ b/src/androidextras/android/qandroidactivitycallbackresultreceiver.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB). +** Copyright (C) 2021 Klaralvdalens Datakonsult AB (KDAB). ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. diff --git a/src/androidextras/android/qandroidactivitycallbackresultreceiver_p.h b/src/androidextras/android/qandroidactivitycallbackresultreceiver_p.h index be9c2b3..5b6bb4c 100644 --- a/src/androidextras/android/qandroidactivitycallbackresultreceiver_p.h +++ b/src/androidextras/android/qandroidactivitycallbackresultreceiver_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB). +** Copyright (C) 2021 Klaralvdalens Datakonsult AB (KDAB). ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. diff --git a/src/androidextras/android/qandroidbinder.cpp b/src/androidextras/android/qandroidbinder.cpp index d13d8d5..496cc15 100644 --- a/src/androidextras/android/qandroidbinder.cpp +++ b/src/androidextras/android/qandroidbinder.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. diff --git a/src/androidextras/android/qandroidbinder.h b/src/androidextras/android/qandroidbinder.h index 41aa770..7969a30 100644 --- a/src/androidextras/android/qandroidbinder.h +++ b/src/androidextras/android/qandroidbinder.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. diff --git a/src/androidextras/android/qandroidbinder_p.h b/src/androidextras/android/qandroidbinder_p.h index e3bdabb..972220b 100644 --- a/src/androidextras/android/qandroidbinder_p.h +++ b/src/androidextras/android/qandroidbinder_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. diff --git a/src/androidextras/android/qandroidfunctions.cpp b/src/androidextras/android/qandroidfunctions.cpp index 79d5e3c..cf1f1ff 100644 --- a/src/androidextras/android/qandroidfunctions.cpp +++ b/src/androidextras/android/qandroidfunctions.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> ** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** diff --git a/src/androidextras/android/qandroidintent.cpp b/src/androidextras/android/qandroidintent.cpp index 66969db..c787d79 100644 --- a/src/androidextras/android/qandroidintent.cpp +++ b/src/androidextras/android/qandroidintent.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. diff --git a/src/androidextras/android/qandroidintent.h b/src/androidextras/android/qandroidintent.h index ab319d5..2542ec6 100644 --- a/src/androidextras/android/qandroidintent.h +++ b/src/androidextras/android/qandroidintent.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. diff --git a/src/androidextras/android/qandroidparcel.cpp b/src/androidextras/android/qandroidparcel.cpp index 947fe74..2650236 100644 --- a/src/androidextras/android/qandroidparcel.cpp +++ b/src/androidextras/android/qandroidparcel.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. diff --git a/src/androidextras/android/qandroidparcel.h b/src/androidextras/android/qandroidparcel.h index fde576f..2fae906 100644 --- a/src/androidextras/android/qandroidparcel.h +++ b/src/androidextras/android/qandroidparcel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. diff --git a/src/androidextras/android/qandroidparcel_p.h b/src/androidextras/android/qandroidparcel_p.h index 42eff13..08271c3 100644 --- a/src/androidextras/android/qandroidparcel_p.h +++ b/src/androidextras/android/qandroidparcel_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. diff --git a/src/androidextras/android/qandroidservice.cpp b/src/androidextras/android/qandroidservice.cpp index 628ce13..2ae0656 100644 --- a/src/androidextras/android/qandroidservice.cpp +++ b/src/androidextras/android/qandroidservice.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. diff --git a/src/androidextras/android/qandroidservice.h b/src/androidextras/android/qandroidservice.h index 2217490..b209ab1 100644 --- a/src/androidextras/android/qandroidservice.h +++ b/src/androidextras/android/qandroidservice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. diff --git a/src/androidextras/android/qandroidserviceconnection.cpp b/src/androidextras/android/qandroidserviceconnection.cpp index e61d3b7..9501b13 100644 --- a/src/androidextras/android/qandroidserviceconnection.cpp +++ b/src/androidextras/android/qandroidserviceconnection.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. diff --git a/src/androidextras/android/qandroidserviceconnection.h b/src/androidextras/android/qandroidserviceconnection.h index 26a77aa..7ddcdce 100644 --- a/src/androidextras/android/qandroidserviceconnection.h +++ b/src/androidextras/android/qandroidserviceconnection.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. diff --git a/src/androidextras/android/qjnionload.cpp b/src/androidextras/android/qjnionload.cpp index 0d51e89..1d731db 100644 --- a/src/androidextras/android/qjnionload.cpp +++ b/src/androidextras/android/qjnionload.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. diff --git a/src/androidextras/qandroidextrasglobal.h b/src/androidextras/qandroidextrasglobal.h index 5418002..90a78ad 100644 --- a/src/androidextras/qandroidextrasglobal.h +++ b/src/androidextras/qandroidextrasglobal.h @@ -1,12 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2021 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:COMM$ -** +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -15,25 +14,26 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** $QT_END_LICENSE$ -** -** -** -** -** -** -** -** -** -** -** -** -** -** -** -** -** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or 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.GPL2 and 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-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** +** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/jar/src/org/qtproject/qt5/android/extras/QtAndroidBinder.java b/src/jar/src/org/qtproject/qt5/android/extras/QtAndroidBinder.java index 5127fb9..aed6652 100644 --- a/src/jar/src/org/qtproject/qt5/android/extras/QtAndroidBinder.java +++ b/src/jar/src/org/qtproject/qt5/android/extras/QtAndroidBinder.java @@ -5,8 +5,7 @@ ** ** This file is part of the Android port of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:COMM$ -** +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -15,25 +14,26 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** $QT_END_LICENSE$ -** -** -** -** -** -** -** -** -** -** -** -** -** -** -** -** -** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or 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.GPL2 and 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-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** +** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/jar/src/org/qtproject/qt5/android/extras/QtAndroidServiceConnection.java b/src/jar/src/org/qtproject/qt5/android/extras/QtAndroidServiceConnection.java index e2e90de..6b35817 100644 --- a/src/jar/src/org/qtproject/qt5/android/extras/QtAndroidServiceConnection.java +++ b/src/jar/src/org/qtproject/qt5/android/extras/QtAndroidServiceConnection.java @@ -5,8 +5,7 @@ ** ** This file is part of the Android port of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:COMM$ -** +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -15,25 +14,26 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** $QT_END_LICENSE$ -** -** -** -** -** -** -** -** -** -** -** -** -** -** -** -** -** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or 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.GPL2 and 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-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** +** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/jar/src/org/qtproject/qt5/android/extras/QtNative.java b/src/jar/src/org/qtproject/qt5/android/extras/QtNative.java index f54a9aa..79a0592 100644 --- a/src/jar/src/org/qtproject/qt5/android/extras/QtNative.java +++ b/src/jar/src/org/qtproject/qt5/android/extras/QtNative.java @@ -5,8 +5,7 @@ ** ** This file is part of the Android port of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:COMM$ -** +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -15,25 +14,26 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** $QT_END_LICENSE$ -** -** -** -** -** -** -** -** -** -** -** -** -** -** -** -** -** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or 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.GPL2 and 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-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** +** $QT_END_LICENSE$ ** ****************************************************************************/ |