summaryrefslogtreecommitdiffstats
path: root/src/doc
diff options
context:
space:
mode:
authorGatis Paeglis <gatis.paeglis@theqtcompany.com>2014-12-03 09:40:48 +0100
committerGatis Paeglis <gatis.paeglis@theqtcompany.com>2014-12-05 12:24:51 +0200
commit8d93772285f06f3e5239183a7fd8306c9d090930 (patch)
tree38525052e6497d7628214ae39a2d01705efe1505 /src/doc
parentdaa2a8fdaf6c3cd471b776ad1282b5d32549ffd0 (diff)
Wifi - c++/qml getting started guide and wifi doc update
c++ getting started guide qml getting started guide documenting qml elements documenting c++ classes Task-number: QTEE-810 Change-Id: I669d11c65e5359fc9ec863b03b8b56ce2ef1151b Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@theqtcompany.com> Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
Diffstat (limited to 'src/doc')
-rw-r--r--src/doc/config/b2qt.qdocconf13
-rw-r--r--src/doc/src/qtee-changelog.qdoc2
-rw-r--r--src/doc/src/qtee-index.qdoc2
-rw-r--r--src/doc/src/qtee-licenses.qdoc2
-rw-r--r--src/doc/src/qtee-qml-reference.qdoc16
5 files changed, 23 insertions, 12 deletions
diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf
index c5b4a9a..727930a 100644
--- a/src/doc/config/b2qt.qdocconf
+++ b/src/doc/config/b2qt.qdocconf
@@ -4,15 +4,18 @@ naturallanguage = en_US
outputencoding = UTF-8
sourceencoding = UTF-8
-project = QtEnterpriseEmbedded
+project = QtForDeviceCreation
description = Qt for Device Creation
version = 4.0.0
sourcedirs = ../src \
../../imports/wifi \
- ../../imports/utils
+ ../../imports/utils \
+ ../../wifi
-headerdirs = ../../imports/wifi
+headerdirs += ../../wifi
+
+exampledirs += ../../../examples
imagedirs += ../images
@@ -43,4 +46,6 @@ macro.B2QA = "\\e {Boot to Qt for embedded Android}"
macro.B2QL = "\\e {Boot to Qt for embedded Linux}"
navigation.landingpage = "Qt for Device Creation"
-navigation.qmltypespage = "Add-On QML Types"
+navigation.qmltypespage = "Add-On Modules"
+
+Cpp.ignoreDirectives += Q_DECLARE_LOGGING_CATEGORY
diff --git a/src/doc/src/qtee-changelog.qdoc b/src/doc/src/qtee-changelog.qdoc
index 5f18e4c..4113e52 100644
--- a/src/doc/src/qtee-changelog.qdoc
+++ b/src/doc/src/qtee-changelog.qdoc
@@ -179,7 +179,7 @@
\li Update new content to device without erasing it first on \B2QL
\li All images now contain generally used CA certificates
\li Toolchains updated to support Qt WebEngine
- \li Documentation was added for QML types provided by the \l {QtWifi Module}
+ \li Documentation was added for QML types provided by the \l {B2Qt.Wifi Module}
\li Emulator: Debug logging functionality was added
\li Various documentation improvements
\li \SDK installer error handling was improved
diff --git a/src/doc/src/qtee-index.qdoc b/src/doc/src/qtee-index.qdoc
index 02eb4e2..41eff4b 100644
--- a/src/doc/src/qtee-index.qdoc
+++ b/src/doc/src/qtee-index.qdoc
@@ -68,7 +68,7 @@
\section1 Reference Documentation
\list
- \li \l{Add-On QML Types}
+ \li \l{Add-On Modules}
\endlist
*/
diff --git a/src/doc/src/qtee-licenses.qdoc b/src/doc/src/qtee-licenses.qdoc
index daf8b82..791ec92 100644
--- a/src/doc/src/qtee-licenses.qdoc
+++ b/src/doc/src/qtee-licenses.qdoc
@@ -21,7 +21,7 @@
\page qtee-licenses.html
\title License Information
\previouspage qtee-troubleshooting.html
- \nextpage qtee-qml-reference.html
+ \nextpage qtee-module-reference.html
\section1 Licensing
diff --git a/src/doc/src/qtee-qml-reference.qdoc b/src/doc/src/qtee-qml-reference.qdoc
index 0107e97..121b534 100644
--- a/src/doc/src/qtee-qml-reference.qdoc
+++ b/src/doc/src/qtee-qml-reference.qdoc
@@ -18,14 +18,14 @@
****************************************************************************/
/*!
- \page qtee-qml-reference.html
- \title Add-On QML Types
+ \page qtee-module-reference.html
+ \title Add-On Modules
\previouspage qtee-licenses.html
- The following QML modules are included in the \B2Q stack and provide
- additional QML types that are useful in an embedded application:
+ The following modules included in the \B2Q stack, provide
+ additional API that are useful for an embedded application:
- \annotatedlist qtee-qmlmodules
+ \annotatedlist qtee-modules
\section1 B2Qt Utils Module
@@ -33,6 +33,12 @@
\section1 B2Qt Wifi Module
+ \section2 QML Types
+
\annotatedlist wifi-qmltypes
+
+ \section2 C++ Classes
+
+ \annotatedlist wifi-cppclasses
*/