diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-12 09:19:40 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-12 09:19:40 +0300 |
| commit | 2b6766f09ad53f1cf2ba7cfe95976b4322c2e8fd (patch) | |
| tree | 35c238f57be475e69abd3e34baa32a136739dfd5 /src/doc/src/external-resources.qdoc | |
| parent | f6de3a059ea2207104ff8f23718d714ac4ff41d2 (diff) | |
| parent | 57b15814c8865e517c43fe173c0ffcadf8557ade (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
* origin/5.7:
Doc: Document QtDeviceUtilities
Doc: Remove rest of the generic Qt for Device Creation doc files
Doc: Bump version to 5.7.1
Doc: Remove generic Device Creation documentation
Added additional instructions for Windows users using BeagleBone Black
Fixes to networkSettingsService model handling
Updated icons
Doc: Add documentation for NVIDIA DRIVE CX
Doc: Add documentation for Intel NUC
Doc: Remove references to SILICA ArchiTech Tibidabo
Doc: Bump version to 5.7.0
Fixed connman backend crashes and changed it as default.
Conflicts:
src/doc/src/qtee-changelog.qdoc
src/doc/src/qtee-index.qdoc
src/doc/src/qtee-static-linking.qdoc
Change-Id: Idb13f9fd130211213434576ab5cc3d38766e9711
Diffstat (limited to 'src/doc/src/external-resources.qdoc')
| -rw-r--r-- | src/doc/src/external-resources.qdoc | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/doc/src/external-resources.qdoc b/src/doc/src/external-resources.qdoc new file mode 100644 index 0000000..9914ad3 --- /dev/null +++ b/src/doc/src/external-resources.qdoc @@ -0,0 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** All rights reserved. +** For any questions to The Qt Company, please use the contact form at +** http://www.qt.io/contact-us +** +** This file is part of Qt for Device Creation. +** +** Licensees holding valid commercial Qt licenses may use this file in +** 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. +** +****************************************************************************/ +/*! + \externalpage https://doc.qt.io/QtForDeviceCreation + \title Qt for Device Creation +*/ + |