diff options
author | Alex Blasche <alexander.blasche@qt.io> | 2017-10-17 07:50:11 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@qt.io> | 2017-10-17 07:50:11 +0200 |
commit | 013ad0570844975cd5c72a77d1cfefa30c3ea656 (patch) | |
tree | 9fb1d5afc8b29f97a60ca20d514269b9d1658ef2 /examples/bluetooth/btscanner | |
parent | 18af3226765b62312acc8f801cc531fde0d9822b (diff) | |
parent | 80d85141aa496583c5cfa6dd0f62d5eb4a8ba660 (diff) |
Merge remote-tracking branch 'gerrit/5.9' into 5.10v5.10.0-beta3
Change-Id: I84bfe86751c27eabb4e75912ae3c0b4d3781faf1
Diffstat (limited to 'examples/bluetooth/btscanner')
-rw-r--r-- | examples/bluetooth/btscanner/doc/src/btscanner.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/bluetooth/btscanner/doc/src/btscanner.qdoc b/examples/bluetooth/btscanner/doc/src/btscanner.qdoc index 600cfe39..c4e45650 100644 --- a/examples/bluetooth/btscanner/doc/src/btscanner.qdoc +++ b/examples/bluetooth/btscanner/doc/src/btscanner.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 local connectivty modules. ** @@ -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$ ** ****************************************************************************/ |