diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-29 15:08:36 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-09-29 15:08:36 +0000 |
| commit | a6ca622baf9e4f6afee783fd87a6d3f245efd278 (patch) | |
| tree | a04c866cdeef6a7fa48583d5f4bcf664e5088382 /examples/webenginewidgets/maps/doc/src/maps.qdoc | |
| parent | 24b5f01726351c6e6e925bfaf4c7575f469ad0d0 (diff) | |
| parent | fa12e9c1c3634696cf3e0754ab9c374456945efc (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
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$ ** ****************************************************************************/ |