From a5db288e9f55f27644c332dd66c98513fce7d123 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Tue, 18 Mar 2014 09:48:40 +0100 Subject: Add documentation to QtWifi library MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ifd71c65a155ad296f3491085e91556eb69226b2b Reviewed-by: Topi Reiniö --- src/doc/config/b2qt.qdocconf | 8 +++++--- src/doc/config/html-offline.qdocconf | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/doc/config') diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf index 7c97275..50a7a6c 100644 --- a/src/doc/config/b2qt.qdocconf +++ b/src/doc/config/b2qt.qdocconf @@ -8,10 +8,12 @@ project = QtEnterpriseEmbedded description = Qt Enterprise Embedded Documentation version = 2.0.0 -sourcedirs = ../src -imagedirs += ../images +sourcedirs = ../src \ + ../../imports/wifi + +headerdirs = ../../imports/wifi -sources.fileextensions = "*.qdoc" +imagedirs += ../images indexes = $QT_INSTALL_DOCS/qtquick/qtquick.index \ $QT_INSTALL_DOCS/emulator/emulator.index diff --git a/src/doc/config/html-offline.qdocconf b/src/doc/config/html-offline.qdocconf index 29a5613..0e01c05 100644 --- a/src/doc/config/html-offline.qdocconf +++ b/src/doc/config/html-offline.qdocconf @@ -1,5 +1,7 @@ # use the global Qt template with modifications to the html footer include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) +include($QT_INSTALL_DOCS/global/qt-cpp-defines.qdocconf) +include($QT_INSTALL_DOCS/global/fileextensions.qdocconf) HTML.nobreadcrumbs = "true" -- cgit v1.2.3 From 42834a50796fdbd563c6f4449a3bd57ce8aaac91 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Mon, 31 Mar 2014 14:13:26 +0200 Subject: Doc: Improve instructions for deploying existing projects - Mention Widget applications - Simplify the .pro file code snippets and make them copy-pastable - Discuss deploying application resources - Link to Qt Resource System docs in Qt Core Task-number: QTEE-399 Change-Id: I0bcc38a188b848800e79c9c4a5fde7bd9f536fbd Reviewed-by: Andy Nichols Reviewed-by: Kalle Viironen --- src/doc/config/b2qt.qdocconf | 1 + 1 file changed, 1 insertion(+) (limited to 'src/doc/config') diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf index 50a7a6c..95b7337 100644 --- a/src/doc/config/b2qt.qdocconf +++ b/src/doc/config/b2qt.qdocconf @@ -16,6 +16,7 @@ headerdirs = ../../imports/wifi imagedirs += ../images indexes = $QT_INSTALL_DOCS/qtquick/qtquick.index \ + $QT_INSTALL_DOCS/qtcore/qtcore.index \ $QT_INSTALL_DOCS/emulator/emulator.index qhp.projects = B2Qt -- cgit v1.2.3 From f29274610c980b6c2334d47a9552098d7b9e071b Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 1 Apr 2014 10:26:24 +0200 Subject: Doc: Create QML Type reference page Create a landing page for QtEE-specific QML modules and types. Ensure it links correctly to WiFi Module documentation, and add it to TOC. Change-Id: Ib3edf9ff8e50f11e138a57aabc1f84749ac48e16 Reviewed-by: Gatis Paeglis Reviewed-by: Eirik Aavitsland --- src/doc/config/b2qt.qdocconf | 1 + 1 file changed, 1 insertion(+) (limited to 'src/doc/config') diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf index 95b7337..dabd3f2 100644 --- a/src/doc/config/b2qt.qdocconf +++ b/src/doc/config/b2qt.qdocconf @@ -38,3 +38,4 @@ macro.B2QA = "\\e {Boot to Qt for embedded Android}" macro.B2QL = "\\e {Boot to Qt for embedded Linux}" navigation.landingpage = "Qt Enterprise Embedded" +navigation.qmltypespage = "Add-On QML Types" -- cgit v1.2.3 From 3d504f38e226f63ccf944e5082a0678bf68b4ceb Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 8 Apr 2014 13:23:50 +0300 Subject: doc: update version number to 2.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9eecbf40133936c799cbdd3848a46a1350ce49c8 Reviewed-by: Topi Reiniö --- src/doc/config/b2qt.qdocconf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/doc/config') diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf index dabd3f2..93b1dfc 100644 --- a/src/doc/config/b2qt.qdocconf +++ b/src/doc/config/b2qt.qdocconf @@ -6,7 +6,7 @@ sourceencoding = UTF-8 project = QtEnterpriseEmbedded description = Qt Enterprise Embedded Documentation -version = 2.0.0 +version = 2.1.0 sourcedirs = ../src \ ../../imports/wifi @@ -22,7 +22,7 @@ indexes = $QT_INSTALL_DOCS/qtquick/qtquick.index \ qhp.projects = B2Qt qhp.B2Qt.file = b2qt.qhp -qhp.B2Qt.namespace = com.digia.b2qt.200 +qhp.B2Qt.namespace = com.digia.b2qt.210 qhp.B2Qt.virtualFolder = b2qt qhp.B2Qt.indexTitle = Qt Enterprise Embedded Documentation qhp.B2Qt.indexRoot = -- cgit v1.2.3 From f9da7d90608cb4ce511770f5da8ef666e8a3e1b0 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 11 Apr 2014 12:36:07 +0200 Subject: Doc: Add ChangeLog for Qt Enterprise Embedded 2.1.0 Task-number: QTEE-463 Change-Id: Id03c73e7285aa5b738b992608d37c3c1a4d6b1b6 Reviewed-by: Kalle Viironen --- src/doc/config/b2qt.qdocconf | 1 + 1 file changed, 1 insertion(+) (limited to 'src/doc/config') diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf index 93b1dfc..3f8f92a 100644 --- a/src/doc/config/b2qt.qdocconf +++ b/src/doc/config/b2qt.qdocconf @@ -17,6 +17,7 @@ imagedirs += ../images indexes = $QT_INSTALL_DOCS/qtquick/qtquick.index \ $QT_INSTALL_DOCS/qtcore/qtcore.index \ + $QT_INSTALL_DOCS/qtserialport/qtserialport.index \ $QT_INSTALL_DOCS/emulator/emulator.index qhp.projects = B2Qt -- cgit v1.2.3