diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-27 07:15:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-27 07:15:35 +0200 |
| commit | 1cb4027e0a59e1875db88b72afb5833aafbd87eb (patch) | |
| tree | 35646da4972db8bff385ec4147161d133e7bf1b8 /src/multimediawidgets | |
| parent | 82694e41b1d37e04ecc911f420ad4317220f8180 (diff) | |
| parent | 732d9cb6848a42f5a61b2b74dece962cdfba1d31 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Ib509a8c90dd6c7229510a400612cc27a4957d015
Diffstat (limited to 'src/multimediawidgets')
| -rw-r--r-- | src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc | 6 | ||||
| -rw-r--r-- | src/multimediawidgets/doc/src/qtmultimediawidgets.qdoc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc b/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc index 1b76d8259..0c2271ef0 100644 --- a/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc +++ b/src/multimediawidgets/doc/src/qtmultimediawidgets-index.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$ ** ****************************************************************************/ diff --git a/src/multimediawidgets/doc/src/qtmultimediawidgets.qdoc b/src/multimediawidgets/doc/src/qtmultimediawidgets.qdoc index 735c23e1a..691d66838 100644 --- a/src/multimediawidgets/doc/src/qtmultimediawidgets.qdoc +++ b/src/multimediawidgets/doc/src/qtmultimediawidgets.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$ ** ****************************************************************************/ |