diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2020-08-20 13:19:39 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-08-21 11:29:49 +0200 |
commit | ce3487c74e7cf21405f35f809955b26e1311f460 (patch) | |
tree | 4f3d0c9e374856e5e3b382f716ee3c5cead03890 | |
parent | 0994199f4e78ab36a91979b81ea36eee0d7369b2 (diff) |
Add header.GPL-MARKETPLACE
We need a unique header.* file since we use the new "Marketplace"
license.
Task-number: QTQAINFRA-3874
Change-Id: Iae44a4d0e34e97a2f358f6aaaf248812c19ebd36
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
21 files changed, 52 insertions, 23 deletions
diff --git a/header.GPL-MARKETPLACE b/header.GPL-MARKETPLACE new file mode 100644 index 0000000..a964046 --- /dev/null +++ b/header.GPL-MARKETPLACE @@ -0,0 +1,29 @@ +/**************************************************************************** +** +** Copyright (C) YYYY The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Quick Calendar. +** +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the Marketplace license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + diff --git a/src/imports/calendar/DayOfWeekRow.qml b/src/imports/calendar/DayOfWeekRow.qml index e706dc7..283d664 100644 --- a/src/imports/calendar/DayOfWeekRow.qml +++ b/src/imports/calendar/DayOfWeekRow.qml @@ -5,10 +5,10 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the +** accordance with the Marketplace license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms ** and conditions see https://www.qt.io/terms-conditions. For further diff --git a/src/imports/calendar/MonthGrid.qml b/src/imports/calendar/MonthGrid.qml index cd228bd..e369b89 100644 --- a/src/imports/calendar/MonthGrid.qml +++ b/src/imports/calendar/MonthGrid.qml @@ -5,10 +5,10 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the +** accordance with the Marketplace license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms ** and conditions see https://www.qt.io/terms-conditions. For further diff --git a/src/imports/calendar/WeekNumberColumn.qml b/src/imports/calendar/WeekNumberColumn.qml index 2fdf752..b28f5a1 100644 --- a/src/imports/calendar/WeekNumberColumn.qml +++ b/src/imports/calendar/WeekNumberColumn.qml @@ -5,10 +5,10 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the +** accordance with the Marketplace license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms ** and conditions see https://www.qt.io/terms-conditions. For further diff --git a/src/imports/calendar/qquickcalendar.cpp b/src/imports/calendar/qquickcalendar.cpp index da0f187..cb7b6a1 100644 --- a/src/imports/calendar/qquickcalendar.cpp +++ b/src/imports/calendar/qquickcalendar.cpp @@ -5,7 +5,7 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the Marketplace license agreement provided with the diff --git a/src/imports/calendar/qquickcalendar_p.h b/src/imports/calendar/qquickcalendar_p.h index ec0aaa1..73c210e 100644 --- a/src/imports/calendar/qquickcalendar_p.h +++ b/src/imports/calendar/qquickcalendar_p.h @@ -5,7 +5,7 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the Marketplace license agreement provided with the diff --git a/src/imports/calendar/qquickcalendarmodel.cpp b/src/imports/calendar/qquickcalendarmodel.cpp index d3b21a4..df6920d 100644 --- a/src/imports/calendar/qquickcalendarmodel.cpp +++ b/src/imports/calendar/qquickcalendarmodel.cpp @@ -5,7 +5,7 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the Marketplace license agreement provided with the diff --git a/src/imports/calendar/qquickcalendarmodel_p.h b/src/imports/calendar/qquickcalendarmodel_p.h index 57bad3a..21d6454 100644 --- a/src/imports/calendar/qquickcalendarmodel_p.h +++ b/src/imports/calendar/qquickcalendarmodel_p.h @@ -5,7 +5,7 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the Marketplace license agreement provided with the diff --git a/src/imports/calendar/qquickdayofweekmodel.cpp b/src/imports/calendar/qquickdayofweekmodel.cpp index 89ba16c..a7111ec 100644 --- a/src/imports/calendar/qquickdayofweekmodel.cpp +++ b/src/imports/calendar/qquickdayofweekmodel.cpp @@ -5,7 +5,7 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the Marketplace license agreement provided with the diff --git a/src/imports/calendar/qquickdayofweekmodel_p.h b/src/imports/calendar/qquickdayofweekmodel_p.h index 83157ab..50fbe27 100644 --- a/src/imports/calendar/qquickdayofweekmodel_p.h +++ b/src/imports/calendar/qquickdayofweekmodel_p.h @@ -5,7 +5,7 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the Marketplace license agreement provided with the diff --git a/src/imports/calendar/qquickdayofweekrow.cpp b/src/imports/calendar/qquickdayofweekrow.cpp index 15682df..60c9c5f 100644 --- a/src/imports/calendar/qquickdayofweekrow.cpp +++ b/src/imports/calendar/qquickdayofweekrow.cpp @@ -5,7 +5,7 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the Marketplace license agreement provided with the diff --git a/src/imports/calendar/qquickdayofweekrow_p.h b/src/imports/calendar/qquickdayofweekrow_p.h index 50d59ff..e2cbb16 100644 --- a/src/imports/calendar/qquickdayofweekrow_p.h +++ b/src/imports/calendar/qquickdayofweekrow_p.h @@ -5,7 +5,7 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the Marketplace license agreement provided with the diff --git a/src/imports/calendar/qquickmonthgrid.cpp b/src/imports/calendar/qquickmonthgrid.cpp index 8dce8b6..cf49565 100644 --- a/src/imports/calendar/qquickmonthgrid.cpp +++ b/src/imports/calendar/qquickmonthgrid.cpp @@ -5,7 +5,7 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the Marketplace license agreement provided with the diff --git a/src/imports/calendar/qquickmonthgrid_p.h b/src/imports/calendar/qquickmonthgrid_p.h index 0afbd0f..824f896 100644 --- a/src/imports/calendar/qquickmonthgrid_p.h +++ b/src/imports/calendar/qquickmonthgrid_p.h @@ -5,7 +5,7 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the Marketplace license agreement provided with the diff --git a/src/imports/calendar/qquickmonthmodel.cpp b/src/imports/calendar/qquickmonthmodel.cpp index 8d053fb..3490988 100644 --- a/src/imports/calendar/qquickmonthmodel.cpp +++ b/src/imports/calendar/qquickmonthmodel.cpp @@ -5,7 +5,7 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the Marketplace license agreement provided with the diff --git a/src/imports/calendar/qquickmonthmodel_p.h b/src/imports/calendar/qquickmonthmodel_p.h index c5ee954..0df6ef7 100644 --- a/src/imports/calendar/qquickmonthmodel_p.h +++ b/src/imports/calendar/qquickmonthmodel_p.h @@ -5,7 +5,7 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the Marketplace license agreement provided with the diff --git a/src/imports/calendar/qquickweeknumbercolumn.cpp b/src/imports/calendar/qquickweeknumbercolumn.cpp index c69c139..35e20d6 100644 --- a/src/imports/calendar/qquickweeknumbercolumn.cpp +++ b/src/imports/calendar/qquickweeknumbercolumn.cpp @@ -5,7 +5,7 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the Marketplace license agreement provided with the diff --git a/src/imports/calendar/qquickweeknumbercolumn_p.h b/src/imports/calendar/qquickweeknumbercolumn_p.h index 3721b3f..8c1036c 100644 --- a/src/imports/calendar/qquickweeknumbercolumn_p.h +++ b/src/imports/calendar/qquickweeknumbercolumn_p.h @@ -5,7 +5,7 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the Marketplace license agreement provided with the diff --git a/src/imports/calendar/qquickweeknumbermodel.cpp b/src/imports/calendar/qquickweeknumbermodel.cpp index 31473a3..7ce8bbb 100644 --- a/src/imports/calendar/qquickweeknumbermodel.cpp +++ b/src/imports/calendar/qquickweeknumbermodel.cpp @@ -5,7 +5,7 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the Marketplace license agreement provided with the diff --git a/src/imports/calendar/qquickweeknumbermodel_p.h b/src/imports/calendar/qquickweeknumbermodel_p.h index 258115d..eb4215b 100644 --- a/src/imports/calendar/qquickweeknumbermodel_p.h +++ b/src/imports/calendar/qquickweeknumbermodel_p.h @@ -5,7 +5,7 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the Marketplace license agreement provided with the diff --git a/src/imports/calendar/qtquickcalendarplugin.cpp b/src/imports/calendar/qtquickcalendarplugin.cpp index 6f57cc5..e1da085 100644 --- a/src/imports/calendar/qtquickcalendarplugin.cpp +++ b/src/imports/calendar/qtquickcalendarplugin.cpp @@ -5,7 +5,7 @@ ** ** This file is part of Qt Quick Calendar. ** -** $QT_BEGIN_LICENSE:GPL$ +** $QT_BEGIN_LICENSE:GPL-MARKETPLACE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the Marketplace license agreement provided with the |