summaryrefslogtreecommitdiffstats
path: root/src/doc/src
diff options
context:
space:
mode:
authorSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-11-22 09:59:53 +0200
committerSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-11-24 11:53:15 +0000
commit87ec8abff21f12686372302ef704768c4df2611e (patch)
tree05747cb7bc97f13e459cad7b6471ff1a628f8c0b /src/doc/src
parent31d4c8936d0207913f2533f28387a804ae39f4c6 (diff)
Update license headers
Documentation files now use qtbase/header.FDL and scripts qtbase/header.GPL licenses. Task-number: QTBUG-64693 Change-Id: I2c0f6fe8ece7434f9dc68c1a185532ae6eb023fa Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/doc/src')
-rw-r--r--src/doc/src/external-resources.qdoc21
-rw-r--r--src/doc/src/qtdeviceutilities.qdoc21
-rw-r--r--src/doc/src/wifiexample.qdoc21
3 files changed, 45 insertions, 18 deletions
diff --git a/src/doc/src/external-resources.qdoc b/src/doc/src/external-resources.qdoc
index 2edf436..38e9654 100644
--- a/src/doc/src/external-resources.qdoc
+++ b/src/doc/src/external-resources.qdoc
@@ -1,18 +1,27 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** All rights reserved.
-** For any questions to The Qt Company, please use the contact form at
-** http://www.qt.io/contact-us
+** Contact: https://www.qt.io/licensing/
**
-** This file is part of Qt for Device Creation.
+** This file is part of the Device Utilities module of the Qt Toolkit.
**
+** $QT_BEGIN_LICENSE:FDL$
+** 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 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. 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.
+** $QT_END_LICENSE$
**
****************************************************************************/
/*!
diff --git a/src/doc/src/qtdeviceutilities.qdoc b/src/doc/src/qtdeviceutilities.qdoc
index 9e692fe..9c7c5d5 100644
--- a/src/doc/src/qtdeviceutilities.qdoc
+++ b/src/doc/src/qtdeviceutilities.qdoc
@@ -1,18 +1,27 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** All rights reserved.
-** For any questions to The Qt Company, please use the contact form at
-** http://www.qt.io/contact-us
+** Contact: https://www.qt.io/licensing/
**
-** This file is part of Qt for Device Creation.
+** This file is part of the Device Utilities module of the Qt Toolkit.
**
+** $QT_BEGIN_LICENSE:FDL$
+** 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 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. 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.
+** $QT_END_LICENSE$
**
****************************************************************************/
/*!
diff --git a/src/doc/src/wifiexample.qdoc b/src/doc/src/wifiexample.qdoc
index 6e28099..ce5d43c 100644
--- a/src/doc/src/wifiexample.qdoc
+++ b/src/doc/src/wifiexample.qdoc
@@ -1,18 +1,27 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** All rights reserved.
-** For any questions to The Qt Company, please use the contact form at
-** http://www.qt.io/contact-us
+** Contact: https://www.qt.io/licensing/
**
-** This file is part of Qt for Device Creation.
+** This file is part of the Device Utilities module of the Qt Toolkit.
**
+** $QT_BEGIN_LICENSE:FDL$
+** 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 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. 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.
+** $QT_END_LICENSE$
**
****************************************************************************/
/*!