summaryrefslogtreecommitdiffstats
path: root/src/jsonstream/qjsontokenauthority.h
diff options
context:
space:
mode:
authorTeemu Kaukoranta <teemu.kaukoranta@digia.com>2013-05-20 15:53:46 +0300
committerSergio Ahumada <sergio.ahumada@digia.com>2013-05-23 11:17:01 +0200
commit3238ddf268ddeddc266393c1020a70325d613adf (patch)
tree9508f07e3b2b8f93dd273b0fd3671b3fb6f1c2ae /src/jsonstream/qjsontokenauthority.h
parent78ce6934d454a273886d564cf300b510c4df59ab (diff)
Fixed licenses
Updated licenses using replace-licenses.zsh from mkdist repo. Possible copyright and contact changes will come later. Change-Id: I90b78499854e15db2697995b50f21d7c0cc55108 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'src/jsonstream/qjsontokenauthority.h')
-rw-r--r--src/jsonstream/qjsontokenauthority.h16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/jsonstream/qjsontokenauthority.h b/src/jsonstream/qjsontokenauthority.h
index 70908b0..806a933 100644
--- a/src/jsonstream/qjsontokenauthority.h
+++ b/src/jsonstream/qjsontokenauthority.h
@@ -6,23 +6,31 @@
** This file is part of the QtAddOn.JsonStream module of the Qt.
**
** $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
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser
+** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
+** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
+** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**