aboutsummaryrefslogtreecommitdiffstats
path: root/doc/api/plugin-metadata.qdoc
diff options
context:
space:
mode:
Diffstat (limited to 'doc/api/plugin-metadata.qdoc')
-rw-r--r--doc/api/plugin-metadata.qdoc31
1 files changed, 19 insertions, 12 deletions
diff --git a/doc/api/plugin-metadata.qdoc b/doc/api/plugin-metadata.qdoc
index 4675202ec90..83641974d7e 100644
--- a/doc/api/plugin-metadata.qdoc
+++ b/doc/api/plugin-metadata.qdoc
@@ -1,20 +1,27 @@
-/**************************************************************************
+/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
-** This file is part of Qt Creator
+** This file is part of the Qt Creator documentation.
**
+** 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.
**
-** GNU Free Documentation License
-**
+** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of this
-** file.
-**
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
**
-**************************************************************************/
+****************************************************************************/
/*!
\page plugin-meta-data.html
@@ -109,7 +116,7 @@
\row
\li Copyright
\li String
- \li A short copyright notice, like \c{(C) 2007-2008 MyCompany}.
+ \li A short copyright notice, like \c{(C) 2016 MyCompany}.
\row
\li License
\li String or array of strings
@@ -294,7 +301,7 @@
"Version" : "1.0.1",
"CompatVersion" : "1.0.0",
"Vendor" : "My Company",
- "Copyright" : "(C) 2007 MyCompany",
+ "Copyright" : "(C) 2016 MyCompany",
"License" : [
"This is a default license bla",
"blubbblubb",