diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:46:45 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:56:44 +0100 |
| commit | 40a50c0c585eaa838261742e33a547e09d4040d6 (patch) | |
| tree | fc3e9933f4d0b0bbd6c31f3530d86b2caef93cdb /examples/xmlpatterns/schema/doc/src/schema.qdoc | |
| parent | 9e26cfa167778f3d9444aedcb23c8476683b3785 (diff) | |
| parent | b257f032350c555ea52a7dad5a52d0312ab93b5c (diff) | |
| download | qtxmlpatterns-40a50c0c585eaa838261742e33a547e09d4040d6.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
Change-Id: I03793037d5cb382a3ea411286633903e4fee60ce
Diffstat (limited to 'examples/xmlpatterns/schema/doc/src/schema.qdoc')
| -rw-r--r-- | examples/xmlpatterns/schema/doc/src/schema.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/xmlpatterns/schema/doc/src/schema.qdoc b/examples/xmlpatterns/schema/doc/src/schema.qdoc index 110c932..fc5919a 100644 --- a/examples/xmlpatterns/schema/doc/src/schema.qdoc +++ b/examples/xmlpatterns/schema/doc/src/schema.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$ ** ****************************************************************************/ |