diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:45:42 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:27:47 +0100 |
| commit | 3e71f12de6995b2d9aa77b78f86251e49de8b2c5 (patch) | |
| tree | b3a481ba80560cb671dd570db8931200838033be /src/serialbus/doc/src/qtserialbus-index.qdoc | |
| parent | a24e76d16ab3c3b18180e3dce554bc7696ea91c0 (diff) | |
| parent | 60c0114e846a593895503a78d13b006f93e95675 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
Change-Id: Icfbad81955ad8a7c4ddc49ac4ee952bcba6317ec
Diffstat (limited to 'src/serialbus/doc/src/qtserialbus-index.qdoc')
| -rw-r--r-- | src/serialbus/doc/src/qtserialbus-index.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/serialbus/doc/src/qtserialbus-index.qdoc b/src/serialbus/doc/src/qtserialbus-index.qdoc index 790341f..6c91fbf 100644 --- a/src/serialbus/doc/src/qtserialbus-index.qdoc +++ b/src/serialbus/doc/src/qtserialbus-index.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** 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 @@ -20,7 +20,7 @@ ** 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: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ |