summaryrefslogtreecommitdiffstats
path: root/src/doc/src/b2qt-external-pages.qdoc
diff options
context:
space:
mode:
authorKalle Viironen <kalle.viironen@digia.com>2014-04-15 15:16:02 +0300
committerKalle Viironen <kalle.viironen@digia.com>2014-04-15 15:16:16 +0300
commit9627172876cd2a387d44b5a9a6ce0a3867ebc730 (patch)
treeea7b4382c6390ece7e9588e7e71ad7357b13b338 /src/doc/src/b2qt-external-pages.qdoc
parent436af494659d416cfbd531b8d3ba9fc49e2fa710 (diff)
parentf9da7d90608cb4ce511770f5da8ef666e8a3e1b0 (diff)
Merge branch 'stable' into releaseQtEE_v2.1.0
* stable: Doc: Add ChangeLog for Qt Enterprise Embedded 2.1.0 Doc: Disable code highlighting for command-line instructions doc: update version number to 2.1.0 [Wifi] Add new enums and make some API changes Doc: Add documentation on custom build & deploy steps Doc: Create QML Type reference page Doc: Add information about licenses in embedded Linux images Doc: Improve instructions for deploying existing projects Doc: Separate Building Your Own Linux Image into its own page doc: use same directory for yocto and qt doc: config.<MACHINE> needed only once doc: guide for imx53 and how to setup QtCreator Doc: Be more precise on screen content for Nexus7 Add documentation to QtWifi library Doc: Add note for users to not use root for installation doc: describe how to use network connection for adb Rename misleading class name Remove unnecessary roles from QWifiNetworkList Document C++11 usage doc: how to use rebuilt yocto images and BYOS Change-Id: If51af9f476d05e7d147d93670d36ca1b99e03d8c
Diffstat (limited to 'src/doc/src/b2qt-external-pages.qdoc')
-rw-r--r--src/doc/src/b2qt-external-pages.qdoc10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/doc/src/b2qt-external-pages.qdoc b/src/doc/src/b2qt-external-pages.qdoc
index 5196095..694f349 100644
--- a/src/doc/src/b2qt-external-pages.qdoc
+++ b/src/doc/src/b2qt-external-pages.qdoc
@@ -28,6 +28,16 @@
*/
/*!
+ \externalpage https://qtcloudservices.com/products/enginio-data-storage/
+ \title Enginio Data Storage
+*/
+
+/*!
+ \externalpage http://qt.digia.com/Product/Qt-Enterprise-Features/Advanced-Data-Visualization/
+ \title Qt Data Visualization
+*/
+
+/*!
\externalpage http://qt.digia.com/Product/Qt-Enterprise-Features/Qt-Quick-Enterprise-Controls/
\title Qt Quick Enterprise Controls
*/