diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-03-21 20:42:38 +0100 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-03-21 20:42:47 +0100 |
commit | 6767114285db9d0e16dc278d08f231e8561546b4 (patch) | |
tree | 0945902a2242fd7ec0a1f7fd3e6acbb769e723bd /src/qml/doc/src/external-resources.qdoc | |
parent | ee076afedccbe1d37306a7972051f84eb036d655 (diff) | |
parent | c32b109e9dea44c6775c2dbf8f164870c1dc8971 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Ib5662d80d5b2f58cf4634c54c054545ba9df807e
Diffstat (limited to 'src/qml/doc/src/external-resources.qdoc')
-rw-r--r-- | src/qml/doc/src/external-resources.qdoc | 42 |
1 files changed, 37 insertions, 5 deletions
diff --git a/src/qml/doc/src/external-resources.qdoc b/src/qml/doc/src/external-resources.qdoc index 63f59bf3be..68c5ab4664 100644 --- a/src/qml/doc/src/external-resources.qdoc +++ b/src/qml/doc/src/external-resources.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -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$ ** ****************************************************************************/ @@ -44,3 +44,35 @@ \externalpage https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date \title Mozilla Developer Network Date Reference */ +/*! + \externalpage hhttps://www.froglogic.com/squish/gui-testing + \title Squish +*/ +/*! + \externalpage http://doc.qt.io/GammaRay + \title GammaRay +*/ +/*! + \externalpage http://doc.qt.io/QtQmlLive + \title QmlLive +*/ +/*! + \externalpage http://doc.qt.io/qtcreator/creator-debugging-qml.html + \title QML Debugger +*/ +/*! + \externalpage http://doc.qt.io/qtcreator/creator-qml-performance-monitor.html + \title QML Profiler +*/ +/*! + \externalpage http://doc.qt.io/qtcreator/index.html + \title Qt Creator Manual +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-project-creating.html#creating-resource-files + \title Creating Resource Files +*/ +/*! + \externalpage https://fontawesome.com/ + \title Font Awesome +*/ |