diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:18:15 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:18:15 +0100 |
commit | f84d0cc0165047183466a956589315ad41e946d0 (patch) | |
tree | 9dedb5dfde84d4a2732b79e454a48d92158efdbe /doc/src/examples/weatherinfo.qdoc | |
parent | 4dd6b2bfebf02223ef498bf52ce354c628cc9607 (diff) | |
parent | 984ba6977201f8fbd94d44a2b67519e1faf458cc (diff) | |
download | qtsvg-f84d0cc0165047183466a956589315ad41e946d0.tar.gz |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I7e158268343c5d92d666d266a87095f1154714dd
Diffstat (limited to 'doc/src/examples/weatherinfo.qdoc')
-rw-r--r-- | doc/src/examples/weatherinfo.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/examples/weatherinfo.qdoc b/doc/src/examples/weatherinfo.qdoc index 3b24528..cba920d 100644 --- a/doc/src/examples/weatherinfo.qdoc +++ b/doc/src/examples/weatherinfo.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$ ** ****************************************************************************/ |