diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:46:38 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:52:43 +0100 |
| commit | ae1987696185f34482105ef3e542fc6c121d3614 (patch) | |
| tree | 9682c6c202dff40efda39e44a254e97576b55e98 /examples/winextras/quickplayer/doc/src/qtwinextras-quickplayer.qdoc | |
| parent | a56d14f97c4b5aac1ab1cd3e95ce763452ea3e34 (diff) | |
| parent | ea7de894f711d8fa4f6cf78b5a409889849ee1f2 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
Change-Id: I5a19f702cce4bd518f873140c4cbe0c7e53d6bce
Diffstat (limited to 'examples/winextras/quickplayer/doc/src/qtwinextras-quickplayer.qdoc')
| -rw-r--r-- | examples/winextras/quickplayer/doc/src/qtwinextras-quickplayer.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/winextras/quickplayer/doc/src/qtwinextras-quickplayer.qdoc b/examples/winextras/quickplayer/doc/src/qtwinextras-quickplayer.qdoc index 7b67062..02fe61c 100644 --- a/examples/winextras/quickplayer/doc/src/qtwinextras-quickplayer.qdoc +++ b/examples/winextras/quickplayer/doc/src/qtwinextras-quickplayer.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$ ** ****************************************************************************/ |