diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:46:17 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:47:46 +0100 |
commit | 07cbe31332c518993ad8fc5c519abf64a83d4ab9 (patch) | |
tree | 6c9d026bc7cbd7a7082f28087d4221aab6f16170 /src/webchannel/doc/src/module.qdoc | |
parent | ba755c28ea0cd35cfa9d8c77ef7f2c61437ad25b (diff) | |
parent | 87044174033f141d8d333e2a442d826d87db0415 (diff) | |
download | qtwebchannel-07cbe31332c518993ad8fc5c519abf64a83d4ab9.tar.gz |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
Change-Id: I7c3237feec1602fcdd9034e81579fe192f3eabb1
Diffstat (limited to 'src/webchannel/doc/src/module.qdoc')
-rw-r--r-- | src/webchannel/doc/src/module.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/webchannel/doc/src/module.qdoc b/src/webchannel/doc/src/module.qdoc index 6ff2664..1462609 100644 --- a/src/webchannel/doc/src/module.qdoc +++ b/src/webchannel/doc/src/module.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$ ** ****************************************************************************/ |