diff options
author | Kari Oikarinen <kari.oikarinen@qt.io> | 2016-06-06 14:42:26 +0300 |
---|---|---|
committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2016-06-07 07:06:12 +0000 |
commit | 7ff96b74f8721dbaf50722561770815a4530b6a0 (patch) | |
tree | ecb899c4fc33280ade75c6a854d582c704152f89 /screenshot | |
parent | 81f1bfae50bae30e3e13d4ddaa83fe4292de4646 (diff) |
Except the dummy apps under test/. They stay Commercial + BSD.
Change-Id: I4a1a3e8c1fa4f9f3554c1e814e298ac4a077d720
Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
Diffstat (limited to 'screenshot')
-rw-r--r-- | screenshot/Button.qml | 20 | ||||
-rw-r--r-- | screenshot/Main.qml | 20 | ||||
-rw-r--r-- | screenshot/plugin/plugin.cpp | 20 |
3 files changed, 42 insertions, 18 deletions
diff --git a/screenshot/Button.qml b/screenshot/Button.qml index 0c40a3b..0c03ac1 100644 --- a/screenshot/Button.qml +++ b/screenshot/Button.qml @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt for Device Creation. ** -** $QT_BEGIN_LICENSE:COMM$ -** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** 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$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 Rectangle { diff --git a/screenshot/Main.qml b/screenshot/Main.qml index fab236a..8aa0af5 100644 --- a/screenshot/Main.qml +++ b/screenshot/Main.qml @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt for Device Creation. ** -** $QT_BEGIN_LICENSE:COMM$ -** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** 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$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import Qt.labs.screenshot 1.0 diff --git a/screenshot/plugin/plugin.cpp b/screenshot/plugin/plugin.cpp index 705d7a3..f701b88 100644 --- a/screenshot/plugin/plugin.cpp +++ b/screenshot/plugin/plugin.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt for Device Creation. ** -** $QT_BEGIN_LICENSE:COMM$ -** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** 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$ ** -******************************************************************************/ +****************************************************************************/ #include <QtQml/QQmlExtensionPlugin> #include <QtQuick/QQuickItem> |