diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-26 10:35:52 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-29 16:58:04 +0200 |
| commit | fa12e9c1c3634696cf3e0754ab9c374456945efc (patch) | |
| tree | 7729c6d1990dc2d9f4746c45e7fcae96d41a0128 /examples/webenginewidgets/maps/doc/src/maps.qdoc | |
| parent | 9d962bc9424c71a451d04741619c9597f3da8010 (diff) | |
| parent | d044140246734b8851689f55197c03cfd29dec99 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I7094e85a7770303a2ae30baccbc484c04f33600e
Diffstat (limited to 'examples/webenginewidgets/maps/doc/src/maps.qdoc')
| -rw-r--r-- | examples/webenginewidgets/maps/doc/src/maps.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/webenginewidgets/maps/doc/src/maps.qdoc b/examples/webenginewidgets/maps/doc/src/maps.qdoc index 1082cd1e2..5eed9e713 100644 --- a/examples/webenginewidgets/maps/doc/src/maps.qdoc +++ b/examples/webenginewidgets/maps/doc/src/maps.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$ ** ****************************************************************************/ |