summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2017-09-28 15:47:55 +0200
committerKai Koehne <kai.koehne@qt.io>2017-09-29 09:41:55 +0000
commitc64cc8a3c2e8db7b5ba248a140ed8273b2924425 (patch)
tree1aa125f5247a7cd15e5fa1e14e3746533c9d645d
parent88ad2e2b462b84f07ed77b7f7b8a20ec0fabd1c7 (diff)
Fix outdated BSD header
Change-Id: Icfe3f6a712a8e457dd695b5f0f982760eb78f4f1 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
-rw-r--r--src/androidextras/doc/snippets/code/src_androidextras_qandroidjnienvironment.cpp12
-rw-r--r--src/androidextras/doc/snippets/code/src_androidextras_qandroidjniobject.cpp12
2 files changed, 22 insertions, 2 deletions
diff --git a/src/androidextras/doc/snippets/code/src_androidextras_qandroidjnienvironment.cpp b/src/androidextras/doc/snippets/code/src_androidextras_qandroidjnienvironment.cpp
index e3a7eb6..1b404d5 100644
--- a/src/androidextras/doc/snippets/code/src_androidextras_qandroidjnienvironment.cpp
+++ b/src/androidextras/doc/snippets/code/src_androidextras_qandroidjnienvironment.cpp
@@ -6,7 +6,17 @@
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
- ** You may use this file under the terms of the BSD license as follows:
+ ** 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 https://www.qt.io/terms-conditions. For further
+ ** information use the contact form at https://www.qt.io/contact-us.
+ **
+ ** BSD License Usage
+ ** Alternatively, you may use this file under the terms of the BSD license
+ ** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/src/androidextras/doc/snippets/code/src_androidextras_qandroidjniobject.cpp b/src/androidextras/doc/snippets/code/src_androidextras_qandroidjniobject.cpp
index a0c0946..30aaac3 100644
--- a/src/androidextras/doc/snippets/code/src_androidextras_qandroidjniobject.cpp
+++ b/src/androidextras/doc/snippets/code/src_androidextras_qandroidjniobject.cpp
@@ -6,7 +6,17 @@
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
- ** You may use this file under the terms of the BSD license as follows:
+ ** 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 https://www.qt.io/terms-conditions. For further
+ ** information use the contact form at https://www.qt.io/contact-us.
+ **
+ ** BSD License Usage
+ ** Alternatively, you may use this file under the terms of the BSD license
+ ** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are