diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-27 05:40:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-27 05:43:09 +0200 |
| commit | 732d9cb6848a42f5a61b2b74dece962cdfba1d31 (patch) | |
| tree | ccbc4894addfbdd10ec02bae3b30b238e0455785 /examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc | |
| parent | fa8e1e71bb17efe2549d9e81768f19c065065fce (diff) | |
| parent | 08db8a408829cb3bbd204e71dd8d5616e7d21d3d (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
examples/multimedia/declarative-radio/view.qml
src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h
Change-Id: I97b507878b6de04ec38ddd13530e58b8f72390e4
Diffstat (limited to 'examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc')
| -rw-r--r-- | examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc index a28c3478c..4e4032bff 100644 --- a/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc +++ b/examples/multimedia/audiorecorder/doc/src/audiorecorder.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$ ** ****************************************************************************/ |