diff options
author | Alex Blasche <alexander.blasche@qt.io> | 2017-10-17 08:56:40 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@qt.io> | 2017-10-17 08:56:47 +0200 |
commit | 125cdccc346903d6e70ed26289cdaed85e26ec3f (patch) | |
tree | 7df8ca41816c24ccfa6e0c6add4612689a933bdd /src/bluetooth/doc/src/bluetooth-index.qdoc | |
parent | 844382001f8deaa7fcc9faac779b24188f35329b (diff) | |
parent | 013ad0570844975cd5c72a77d1cfefa30c3ea656 (diff) |
Merge remote-tracking branch 'gerrit/5.10' into dev
Change-Id: I3bf7130a204aebd6a52dfe68bfea57767ba1b70e
Diffstat (limited to 'src/bluetooth/doc/src/bluetooth-index.qdoc')
-rw-r--r-- | src/bluetooth/doc/src/bluetooth-index.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/bluetooth/doc/src/bluetooth-index.qdoc b/src/bluetooth/doc/src/bluetooth-index.qdoc index d2db7aa3..9cb5f3b2 100644 --- a/src/bluetooth/doc/src/bluetooth-index.qdoc +++ b/src/bluetooth/doc/src/bluetooth-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$ ** ****************************************************************************/ |