diff options
| author | Liang Qi <[email protected]> | 2017-10-30 08:46:35 +0100 |
|---|---|---|
| committer | Liang Qi <[email protected]> | 2017-10-30 09:51:21 +0100 |
| commit | ff13c5b8576c3c8b6b376291466daab5e597509a (patch) | |
| tree | e79cdb55046bf6ca8c77487efdd4ca5b85b187ec /examples/webview/minibrowser/doc/src/minibrowser.qdoc | |
| parent | 7e71daf48c2ee3c3518cbfe6103d212772ccf414 (diff) | |
| parent | 71932e381ee12528f6516f61c5467f322d8ee903 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
Change-Id: I417d10ac2bbd1da3e06946c3781b942548cfafbe
Diffstat (limited to 'examples/webview/minibrowser/doc/src/minibrowser.qdoc')
| -rw-r--r-- | examples/webview/minibrowser/doc/src/minibrowser.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/webview/minibrowser/doc/src/minibrowser.qdoc b/examples/webview/minibrowser/doc/src/minibrowser.qdoc index fc6887e..3532861 100644 --- a/examples/webview/minibrowser/doc/src/minibrowser.qdoc +++ b/examples/webview/minibrowser/doc/src/minibrowser.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$ ** ****************************************************************************/ |