diff options
| author | Samuli Piippo <samuli.piippo@digia.com> | 2014-09-02 10:23:39 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@digia.com> | 2014-09-02 10:24:26 +0300 |
| commit | 406db8fabcf8de5ab31880ca579edb7004cc4f4e (patch) | |
| tree | 6b349020fef1d2f8f601a509d7c259fa40bea0f9 /doc/b2qt-demos.qdocconf | |
| parent | 2aab20bb2c32aadba2bef16828e3dd0f6c29a30b (diff) | |
| parent | ad9ea42d493bc9b125c019373fa5fe84cfcc225d (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
* origin/stable: (63 commits)
Doc: Bump version to 3.1.1
Make FPS checkbox persistent
Handle accelerometer readings in rotated items
webengine: Add slight delay before loading the start page
webengine: disable the webgl demo
Update screenshot of the Virtual Keyboard demo
[Doc] Use symbolic links for demo preview images
Changed the audio track on the Qt_EnterpriseEmbedded_1080p.mp4 video.
Fix demo descriptions.
launchersettings: make ip field span two columns
Remove deleted demos also from doc
Update all VirtualKeyboard import to version 1.1
Doc: Bump version to 3.1.0
Doc: Content/language improvement for About QtEE demo.
Disable GraphicalEffects demo on beagleboneblack
about: fit text properly to the box
Fix Meet Qt Enterprise Embedded video url on startup
Fix a typo in the new About presentation
About Boot to Qt-demo update
Update Enterprise gallery demo description
...
Change-Id: I928ab65867993c83ae645834430fd15825349fde
Diffstat (limited to 'doc/b2qt-demos.qdocconf')
| -rw-r--r-- | doc/b2qt-demos.qdocconf | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/b2qt-demos.qdocconf b/doc/b2qt-demos.qdocconf index 0a8712f..dfa494a 100644 --- a/doc/b2qt-demos.qdocconf +++ b/doc/b2qt-demos.qdocconf @@ -6,7 +6,7 @@ sourceencoding = UTF-8 project = QtEnterpriseEmbeddedDemos description = Qt Enterprise Embedded Examples and Demos -version = 2.1.0 +version = 3.1.1 sourcedirs = . imagedirs += images @@ -17,12 +17,11 @@ examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhc examples.imageextensions = "*.png *.jpg *.gif" exampledirs = ../basicsuite -examplesinstallpath = ../../../Boot2Qt-2.x/sources/b2qt-demos/basicsuite qhp.projects = QtEnterpriseEmbeddedDemos qhp.QtEnterpriseEmbeddedDemos.file = b2qt-demos.qhp -qhp.QtEnterpriseEmbeddedDemos.namespace = com.digia.b2qt-demos.210 +qhp.QtEnterpriseEmbeddedDemos.namespace = com.digia.b2qt-demos.311 qhp.QtEnterpriseEmbeddedDemos.virtualFolder = b2qt-demos qhp.QtEnterpriseEmbeddedDemos.indexTitle = Qt Enterprise Embedded Examples and Demos qhp.QtEnterpriseEmbeddedDemos.indexRoot = |