diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:18:59 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:18:59 +0100 |
commit | 72659b4a54c5e6f9c57e5724800a69b81681dda0 (patch) | |
tree | 9e108ab0bc1bb778ad89c67336cae4275f4858fc /src/winextras/doc/src/qtwinextras-examples.qdoc | |
parent | 17bdee86da84c6718fc1bbe8cedf5bdf07240837 (diff) | |
parent | 3ad89fd9022e2010eeca7dfa2548eb149dc34fe6 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I74a06808463f12488fe19b3e9ec7d1c20ac529b4
Diffstat (limited to 'src/winextras/doc/src/qtwinextras-examples.qdoc')
-rw-r--r-- | src/winextras/doc/src/qtwinextras-examples.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/winextras/doc/src/qtwinextras-examples.qdoc b/src/winextras/doc/src/qtwinextras-examples.qdoc index 3af2bfb..e51189c 100644 --- a/src/winextras/doc/src/qtwinextras-examples.qdoc +++ b/src/winextras/doc/src/qtwinextras-examples.qdoc @@ -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$ ** ****************************************************************************/ |