diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2014-04-15 15:16:02 +0300 |
|---|---|---|
| committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-04-15 15:16:16 +0300 |
| commit | 9627172876cd2a387d44b5a9a6ce0a3867ebc730 (patch) | |
| tree | ea7b4382c6390ece7e9588e7e71ad7357b13b338 /src/doc/config/b2qt.qdocconf | |
| parent | 436af494659d416cfbd531b8d3ba9fc49e2fa710 (diff) | |
| parent | f9da7d90608cb4ce511770f5da8ef666e8a3e1b0 (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/config/b2qt.qdocconf')
| -rw-r--r-- | src/doc/config/b2qt.qdocconf | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf index 7c97275..3f8f92a 100644 --- a/src/doc/config/b2qt.qdocconf +++ b/src/doc/config/b2qt.qdocconf @@ -6,20 +6,24 @@ sourceencoding = UTF-8 project = QtEnterpriseEmbedded description = Qt Enterprise Embedded Documentation -version = 2.0.0 +version = 2.1.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/qtcore/qtcore.index \ + $QT_INSTALL_DOCS/qtserialport/qtserialport.index \ $QT_INSTALL_DOCS/emulator/emulator.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 = @@ -35,3 +39,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" |