diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:44:54 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:12:02 +0100 |
commit | 2634ca886f6f4dbacebae5f80641b46e06d86854 (patch) | |
tree | c17fa11343ba777a5fd69dab62812ec761d3d763 /examples | |
parent | d811ebc6c6e83b33d765664328da5c8c6f518f66 (diff) | |
parent | da3963e3d406b445223081cbdfe10858ba2036ae (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
Change-Id: I557207cc8d55f9600ce39638a66e3014725fc822
Diffstat (limited to 'examples')
-rw-r--r-- | examples/oauth/redditclient/doc/src/qtnetworkauth-redditclient.qdoc | 8 | ||||
-rw-r--r-- | examples/oauth/twittertimeline/doc/src/qtnetworkauth-twittertimeline.qdoc | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/examples/oauth/redditclient/doc/src/qtnetworkauth-redditclient.qdoc b/examples/oauth/redditclient/doc/src/qtnetworkauth-redditclient.qdoc index e83a5e7..92ca6fb 100644 --- a/examples/oauth/redditclient/doc/src/qtnetworkauth-redditclient.qdoc +++ b/examples/oauth/redditclient/doc/src/qtnetworkauth-redditclient.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** 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$ ** ****************************************************************************/ diff --git a/examples/oauth/twittertimeline/doc/src/qtnetworkauth-twittertimeline.qdoc b/examples/oauth/twittertimeline/doc/src/qtnetworkauth-twittertimeline.qdoc index 2696a2a..7b9e79b 100644 --- a/examples/oauth/twittertimeline/doc/src/qtnetworkauth-twittertimeline.qdoc +++ b/examples/oauth/twittertimeline/doc/src/qtnetworkauth-twittertimeline.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** 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$ ** ****************************************************************************/ |