diff options
author | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-21 12:24:09 +0200 |
---|---|---|
committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-21 12:27:37 +0200 |
commit | 436af494659d416cfbd531b8d3ba9fc49e2fa710 (patch) | |
tree | ab5e6b48e711a3c3a2e2cd4399ce1b3d34347406 /src/doc/config/b2qt.qdocconf | |
parent | a10b8b669d357325e9f0b735bcda42758ad2b3d0 (diff) | |
parent | 4738811e35a559d238ba20703eb792fca8f5756b (diff) |
Merge branch 'stable' into releaseQtEE_v2.0.0
* stable: (90 commits)
Doc: Document support services for Yocto recipes
doc: minor changes to customization inline code blocks
Doc: Clarify which Qt Creator templates work out of the box
Doc: Fix missing sudo for i.MX6 embedded Linux deployment
Doc: Fixed 32bit package install command for newer ubuntu versions
doc: add quide how to use b2qt_build_scripts
Doc: Add instructions how to install newer VirtualBox
[Wifi] Fix initialization code
Doc: Explain about disabling surfaceflinger
Enable internet on eAndroid emulator
Doc: Add instructions for building Boot2Qt demos
Doc: Troubleshooting entry for BeagleBone Black HDMI issues
Don't use wifi on Emulator
Doc: Document building your own embedded linux stack
Update copyright year
Doc: Fix the 2.0 release date
Doc: ChangeLog: Remove 'black screen after exit' from bugfixes
Doc: Use a global Qt documentation template
Doc: Add changelog
Disable QConnectivity daemon on emulator
...
Change-Id: I25ba7e19677c3d91d5e78ab68291296face3c073
Diffstat (limited to 'src/doc/config/b2qt.qdocconf')
-rw-r--r-- | src/doc/config/b2qt.qdocconf | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf index 60bb88e..7c97275 100644 --- a/src/doc/config/b2qt.qdocconf +++ b/src/doc/config/b2qt.qdocconf @@ -4,29 +4,34 @@ naturallanguage = en_US outputencoding = UTF-8 sourceencoding = UTF-8 -project = Boot2Qt -description = Boot to Qt Technology Preview 2 Documentation -version = tp2 +project = QtEnterpriseEmbedded +description = Qt Enterprise Embedded Documentation +version = 2.0.0 sourcedirs = ../src imagedirs += ../images sources.fileextensions = "*.qdoc" +indexes = $QT_INSTALL_DOCS/qtquick/qtquick.index \ + $QT_INSTALL_DOCS/emulator/emulator.index + qhp.projects = B2Qt qhp.B2Qt.file = b2qt.qhp -qhp.B2Qt.namespace = com.digia.b2qt.tp2 +qhp.B2Qt.namespace = com.digia.b2qt.200 qhp.B2Qt.virtualFolder = b2qt -qhp.B2Qt.indexTitle = Boot to Qt Technology Preview 2 +qhp.B2Qt.indexTitle = Qt Enterprise Embedded Documentation qhp.B2Qt.indexRoot = -qhp.B2Qt.subprojects = manual -qhp.B2Qt.subprojects.manual.title = Boot to Qt Introduction -qhp.B2Qt.subprojects.manual.indexTitle = Boot to Qt Introduction -qhp.B2Qt.subprojects.manual.type = manual +qhp.B2Qt.subprojects = manual +qhp.B2Qt.subprojects.manual.title = Qt Enterprise Embedded +qhp.B2Qt.subprojects.manual.indexTitle = Qt Enterprise Embedded +qhp.B2Qt.subprojects.manual.type = manual macro.B2Q = "Boot to Qt" -macro.B2QA = "Boot to Qt for embedded Android" -macro.B2QL = "Boot to Qt for embedded Linux" +macro.SDK = "Qt Enterprise Embedded" +macro.B2QA = "\\e {Boot to Qt for embedded Android}" +macro.B2QL = "\\e {Boot to Qt for embedded Linux}" +navigation.landingpage = "Qt Enterprise Embedded" |