diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:07:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 13:00:03 +0200 |
| commit | c0fe554f498025067edd78e75e3efb46868f8fe6 (patch) | |
| tree | 00b468e1a38f186f908e1c0c9dcca0c183736c3e /examples/sensors/shakeit/doc/src/shakeit.qdoc | |
| parent | 9a1b163e1fdd99a838c082805c687205b766da25 (diff) | |
| parent | 2ff8f06e71d5eeb40cbdebc104c00073a3c2871a (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Iac052b07a815ed6bcaea42109895e323342c5d71
Diffstat (limited to 'examples/sensors/shakeit/doc/src/shakeit.qdoc')
| -rw-r--r-- | examples/sensors/shakeit/doc/src/shakeit.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/sensors/shakeit/doc/src/shakeit.qdoc b/examples/sensors/shakeit/doc/src/shakeit.qdoc index ef3f6538..6a42388b 100644 --- a/examples/sensors/shakeit/doc/src/shakeit.qdoc +++ b/examples/sensors/shakeit/doc/src/shakeit.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$ ** ****************************************************************************/ |