diff options
| author | Liang Qi <[email protected]> | 2017-10-23 12:09:30 +0200 |
|---|---|---|
| committer | Liang Qi <[email protected]> | 2017-10-24 11:13:09 +0200 |
| commit | 15dd1b7883f5dbe66266aeb588381f85f3532ab9 (patch) | |
| tree | 1fa8caa8ec0f38aef39bcf920e3d5c7efeae5cb9 /examples/quick/customitems/painteditem | |
| parent | f82c4de515223574bcc510de0d993426b22bccbe (diff) | |
| parent | ebceda0cad6d86f6d6fe5efbf85a3b06fb4222b0 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/qml/qml/qqmlimport.cpp
src/qml/qml/qqmlimport_p.h
src/qml/qml/qqmltypenamecache.cpp
Done-with: Ulf Hermann<[email protected]>
Change-Id: I41ba7a592b2659ddf53da6952ea3b456a7bba319
Diffstat (limited to 'examples/quick/customitems/painteditem')
| -rw-r--r-- | examples/quick/customitems/painteditem/doc/src/textballoons.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/quick/customitems/painteditem/doc/src/textballoons.qdoc b/examples/quick/customitems/painteditem/doc/src/textballoons.qdoc index 3dc361e4a9..4541ba0bd9 100644 --- a/examples/quick/customitems/painteditem/doc/src/textballoons.qdoc +++ b/examples/quick/customitems/painteditem/doc/src/textballoons.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$ ** ****************************************************************************/ |