diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:42:58 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:49:01 +0100 |
| commit | ae4f854d754ea189be13ef740d631fdb7a72c9a5 (patch) | |
| tree | 7ddef04e125543f40d15b7a15202c9307ff1c009 /examples/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc | |
| parent | b5f423f50a67d7e1ff416e4348517332d46f780f (diff) | |
| parent | 92e56ec250324b0b6d040b83a4fe41cdf6ed5af5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
Change-Id: I67661e95e931fd7c6992f8f1769c50472c5e5f15
Diffstat (limited to 'examples/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc')
| -rw-r--r-- | examples/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc b/examples/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc index 66785e5..0bc08c1 100644 --- a/examples/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc +++ b/examples/androidextras/notification/doc/src/qtandroidextras-example-notification.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$ ** ****************************************************************************/ |