diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-01-19 08:27:25 +0200 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-01-19 12:44:11 +0200 |
commit | 34686dada1ed61f87eaf8eaee5ca9ba5be4ebdd3 (patch) | |
tree | 224b3f482a0010a7f29bae365d3add102418fc8c | |
parent | fb52d4f97f3fb84a960d85de42c3da49b4020a78 (diff) |
Fix copyright years in commercial license headers
Some copyright years were incorrectly updated when
the commercial license header was added to
the files under tqtc-qtandroidextras.
Also, the header.COMM header added to 3 .java files
were it was missing.
Task-number: QTQAINFRA-4146
Change-Id: Iaf357eedecd5f6b231c939cda1e96d774a7c6a7f
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
20 files changed, 97 insertions, 97 deletions
diff --git a/src/androidextras/android/qandroidactivitycallbackresultreceiver.cpp b/src/androidextras/android/qandroidactivitycallbackresultreceiver.cpp index 428e07f..d139130 100644 --- a/src/androidextras/android/qandroidactivitycallbackresultreceiver.cpp +++ b/src/androidextras/android/qandroidactivitycallbackresultreceiver.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 Klaralvdalens Datakonsult AB (KDAB). +** Copyright (C) 2019 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 5b6bb4c..be9c2b3 100644 --- a/src/androidextras/android/qandroidactivitycallbackresultreceiver_p.h +++ b/src/androidextras/android/qandroidactivitycallbackresultreceiver_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 Klaralvdalens Datakonsult AB (KDAB). +** Copyright (C) 2019 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 496cc15..d13d8d5 100644 --- a/src/androidextras/android/qandroidbinder.cpp +++ b/src/androidextras/android/qandroidbinder.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2017 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 7969a30..41aa770 100644 --- a/src/androidextras/android/qandroidbinder.h +++ b/src/androidextras/android/qandroidbinder.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2017 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 972220b..e3bdabb 100644 --- a/src/androidextras/android/qandroidbinder_p.h +++ b/src/androidextras/android/qandroidbinder_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2017 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 cf1f1ff..79d5e3c 100644 --- a/src/androidextras/android/qandroidfunctions.cpp +++ b/src/androidextras/android/qandroidfunctions.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2017 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 c787d79..66969db 100644 --- a/src/androidextras/android/qandroidintent.cpp +++ b/src/androidextras/android/qandroidintent.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2017 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 2542ec6..ab319d5 100644 --- a/src/androidextras/android/qandroidintent.h +++ b/src/androidextras/android/qandroidintent.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2017 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 2650236..947fe74 100644 --- a/src/androidextras/android/qandroidparcel.cpp +++ b/src/androidextras/android/qandroidparcel.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2017 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 2fae906..fde576f 100644 --- a/src/androidextras/android/qandroidparcel.h +++ b/src/androidextras/android/qandroidparcel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2017 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 08271c3..42eff13 100644 --- a/src/androidextras/android/qandroidparcel_p.h +++ b/src/androidextras/android/qandroidparcel_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2017 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 2ae0656..628ce13 100644 --- a/src/androidextras/android/qandroidservice.cpp +++ b/src/androidextras/android/qandroidservice.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2017 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 b209ab1..2217490 100644 --- a/src/androidextras/android/qandroidservice.h +++ b/src/androidextras/android/qandroidservice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2017 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 9501b13..e61d3b7 100644 --- a/src/androidextras/android/qandroidserviceconnection.cpp +++ b/src/androidextras/android/qandroidserviceconnection.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2017 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 7ddcdce..26a77aa 100644 --- a/src/androidextras/android/qandroidserviceconnection.h +++ b/src/androidextras/android/qandroidserviceconnection.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2017 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 1d731db..0d51e89 100644 --- a/src/androidextras/android/qjnionload.cpp +++ b/src/androidextras/android/qjnionload.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2017 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 90a78ad..5418002 100644 --- a/src/androidextras/qandroidextrasglobal.h +++ b/src/androidextras/qandroidextrasglobal.h @@ -1,11 +1,12 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:COMM$ +** ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,27 +15,26 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 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$ ** +** +** +** +** +** +** +** +** +** +** +** +** +** +** +** +** +** +** ****************************************************************************/ #ifndef QTANDROIDEXTRASGLOBAL_H 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 aed6652..5127fb9 100644 --- a/src/jar/src/org/qtproject/qt5/android/extras/QtAndroidBinder.java +++ b/src/jar/src/org/qtproject/qt5/android/extras/QtAndroidBinder.java @@ -5,7 +5,8 @@ ** ** This file is part of the Android port of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:COMM$ +** ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,27 +15,26 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 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$ ** +** +** +** +** +** +** +** +** +** +** +** +** +** +** +** +** +** +** ****************************************************************************/ package org.qtproject.qt5.android.extras; 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 6b35817..e2e90de 100644 --- a/src/jar/src/org/qtproject/qt5/android/extras/QtAndroidServiceConnection.java +++ b/src/jar/src/org/qtproject/qt5/android/extras/QtAndroidServiceConnection.java @@ -5,7 +5,8 @@ ** ** This file is part of the Android port of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:COMM$ +** ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,27 +15,26 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 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$ ** +** +** +** +** +** +** +** +** +** +** +** +** +** +** +** +** +** +** ****************************************************************************/ package org.qtproject.qt5.android.extras; 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 79a0592..f54a9aa 100644 --- a/src/jar/src/org/qtproject/qt5/android/extras/QtNative.java +++ b/src/jar/src/org/qtproject/qt5/android/extras/QtNative.java @@ -5,7 +5,8 @@ ** ** This file is part of the Android port of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:COMM$ +** ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,27 +15,26 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 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$ ** +** +** +** +** +** +** +** +** +** +** +** +** +** +** +** +** +** +** ****************************************************************************/ package org.qtproject.qt5.android.extras; |