diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-01 11:20:50 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-01 11:20:50 +0300 |
| commit | 11632ff411c124d60c3b4f57c8a0d4a70cfb4998 (patch) | |
| tree | 1b060eb033008f6a0f6a0f19398e698b076b07f4 /src/doc/src/shared/b2qt-external-pages.qdoc | |
| parent | c2a9d75aff47d024d249b4d2cedae8307a4cabbb (diff) | |
| parent | eebda51556daae681e9ddb878c36f79e497f5618 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
* origin/5.6:
Doc: Remove generic Device Creation documentation
Conflicts:
src/doc/config/b2qt-project.qdocconf
src/doc/src/devices/qtee-bd-sl-imx6.qdoc
src/doc/src/devices/qtee-beaglebone-black.qdoc
src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc
src/doc/src/devices/qtee-raspberry-pi.qdoc
src/doc/src/devices/qtee-sabre-sd-imx6.qdoc
src/doc/src/devices/qtee-supported-devices.qdoc
src/doc/src/devices/qtee-toradex-apalis.qdoc
src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc
src/doc/src/devices/qtee-toradex-colibri-vf.qdoc
src/doc/src/qtee-changelog.qdoc
src/doc/src/qtee-custom-embedded-linux.qdoc
src/doc/src/qtee-index.qdoc
src/doc/src/qtee-static-linking.qdoc
src/doc/src/shared/detect-sd-card-device-name.qdocinc
Change-Id: I52b87c5c383c6419a35d06cb2a0c87073c9d3c85
Diffstat (limited to 'src/doc/src/shared/b2qt-external-pages.qdoc')
| -rw-r--r-- | src/doc/src/shared/b2qt-external-pages.qdoc | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/src/doc/src/shared/b2qt-external-pages.qdoc b/src/doc/src/shared/b2qt-external-pages.qdoc deleted file mode 100644 index 08628c6..0000000 --- a/src/doc/src/shared/b2qt-external-pages.qdoc +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use the contact form at -** http://www.qt.io -** -** This file is part of Qt Enterprise Embedded. -** -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** the contact form at http://www.qt.io -** -****************************************************************************/ - -/*! - \externalpage http://doc.qt.io/ - \title Qt reference documentation -*/ -/*! - \externalpage http://doc.qt.io/qt-5/licensing.html#licenses-used-in-qt - \title Licenses Used by Qt -*/ - -/*! - \externalpage http://doc.qt.io/qt-5/android-support.html - \title Qt for Android -*/ - -/*! - \externalpage http://www.qt.io/qt-for-device-creation/ - \title product page -*/ - -/*! - \externalpage https://qtcloudservices.com/products/enginio-data-storage/ - \title Enginio Data Storage -*/ - -/*! - \externalpage http://doc.qt.io/QtDataVisualization - \title Qt Data Visualization -*/ - -/*! - \externalpage http://doc.qt.io/QtQuickEnterpriseControls - \title Qt Quick Enterprise Controls -*/ - -/*! - \externalpage http://doc.qt.io/QtVirtualKeyboard - \title Qt Virtual Keyboard -*/ - -/*! - \externalpage http://doc.qt.io/QtCharts - \title Qt Charts -*/ - -/*! - \externalpage http://doc.qt.io/QtQuickCompiler - \title Qt Quick Compiler -*/ - -/*! - \externalpage https://www.yoctoproject.org/ - \title Yocto Project -*/ - -/*! - \externalpage http://blog.qt.digia.com/blog/2014/07/04/making-an-android-device-boot-to-qt/ - \title Android Injection -*/ - -/*! - \externalpage http://doc.qt.io/QtQuick2DRenderer - \title Qt Quick 2D Renderer -*/ |