diff options
author | Jerome Pasion <jerome.pasion@digia.com> | 2014-04-01 16:23:28 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-01 16:51:20 +0200 |
commit | 4c987bf3c20209c69a34798f9a73b68f41b5e718 (patch) | |
tree | 6ee92f8a15ac36072738502db2ff938cd1600fdc | |
parent | dc991f26d1c23d40b13d0742607d1e22bae48858 (diff) | |
download | qtdoc-4c987bf3c20209c69a34798f9a73b68f41b5e718.tar.gz |
Doc: Integrate Enginio into overviews and What's New page.
-Enginio is newly integrated into Qt from Qt 5.3.
Change-Id: Iab6f515c15017095bf1ee5af8a8b26fc8d440dfc
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
-rw-r--r-- | doc/src/datastorage.qdoc | 13 | ||||
-rw-r--r-- | doc/src/external-resources.qdoc | 4 | ||||
-rw-r--r-- | doc/src/qt5-intro.qdoc | 13 | ||||
-rw-r--r-- | doc/src/whatsnew/whatsnew53.qdoc | 1 |
4 files changed, 31 insertions, 0 deletions
diff --git a/doc/src/datastorage.qdoc b/doc/src/datastorage.qdoc index ce0afe0f..32805d7d 100644 --- a/doc/src/datastorage.qdoc +++ b/doc/src/datastorage.qdoc @@ -276,4 +276,17 @@ drive. Examples of archive files are ZIP, TAR, RAR and 7z. Qt has support for archives produced by zlib (see \l{How to compress data with Qt?}{qCompress() and qUncompress()}). + +\section1 Enginio Data Storage + +Enginio is a storage service for applications. New in Qt 5.3, \l{Enginio +Manual}{Enginio} combines a \e{no-SQL} object approach with JSON and Qt APIs to +provide applications reliable and powerful storage capabilities. The C++ and +QML APIs interact with the \l{Enginio Data Storage} servers from Digia. + +\list +\li \l{Enginio Data Storage}{Enginio by Digia} +\li \l{Enginio Manual}{Enginio} - API for developers +\endlist + */ diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index 0a257594..4fe4d781 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -129,3 +129,7 @@ \externalpage http://developer.android.com/guide/topics/manifest/manifest-intro.html \title Android: App Manifest */ +/*! + \externalpage http://engin.io + \title Enginio Data Storage +*/ diff --git a/doc/src/qt5-intro.qdoc b/doc/src/qt5-intro.qdoc index 73cf2547..17fbc488 100644 --- a/doc/src/qt5-intro.qdoc +++ b/doc/src/qt5-intro.qdoc @@ -219,6 +219,19 @@ \li \image qtpositioning_weatherinfo_ex.jpg \endtable + \section1 Enginio Data Storage + + Enginio is a storage service for applications. New in Qt 5.3, + \l{Enginio Manual}{Enginio} combines a \e{no-SQL} object approach with JSON + and Qt APIs to provide applications reliable and powerful storage + capabilities. The C++ and QML APIs interact with the + \l{Enginio Data Storage} servers from Digia. + + \list + \li \l{Enginio Data Storage}{Enginio by Digia} + \li \l{Enginio Manual}{Enginio} - API for developers + \endlist + \section1 WebKit and HTML5 \l {Qt WebKit} is a web content rendering engine based on the open diff --git a/doc/src/whatsnew/whatsnew53.qdoc b/doc/src/whatsnew/whatsnew53.qdoc index 7b094a6a..fb5ff77b 100644 --- a/doc/src/whatsnew/whatsnew53.qdoc +++ b/doc/src/whatsnew/whatsnew53.qdoc @@ -41,6 +41,7 @@ \section1 New Modules \list + \li \l{Enginio Manual}{Enginio} - A client-side library for \l{Enginio Data Storage}. \li \l{Qt WebSockets} - An add-on module that implements the WebSocket standard \l{http://tools.ietf.org/html/rfc6455}{RFC 6455} \endlist |