diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-18 08:55:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-18 08:56:11 +0200 |
| commit | 13f4c129c2ba12956a6105bd57f407cc07708ca1 (patch) | |
| tree | e92a180d0e8c96f6de7488bbd2af58e7923c0069 /examples/script/context2d/doc/src | |
| parent | a4c96742f5166d6354f2ac22233d4679d12ec3ae (diff) | |
| parent | 95b51b007efdec4994f9c0e01b3a9609ffdedf21 (diff) | |
| download | qtscript-13f4c129c2ba12956a6105bd57f407cc07708ca1.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3
Conflicts:
.qmake.conf
qtscript.pro
Change-Id: If0f8875c8af2afb717ba394fac4e506076f01517
Diffstat (limited to 'examples/script/context2d/doc/src')
| -rw-r--r-- | examples/script/context2d/doc/src/context2d.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/script/context2d/doc/src/context2d.qdoc b/examples/script/context2d/doc/src/context2d.qdoc index 73259fe..ee6d6ac 100644 --- a/examples/script/context2d/doc/src/context2d.qdoc +++ b/examples/script/context2d/doc/src/context2d.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$ ** ****************************************************************************/ |