diff options
| author | Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> | 2015-06-16 15:45:36 +0200 |
|---|---|---|
| committer | Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> | 2015-06-16 15:45:36 +0200 |
| commit | 7878d66f56dd601757505f2e29b49266852f1ff2 (patch) | |
| tree | 010caff93c1f25b9f204650278d020108041aa4d /doc/b2qt-demos.qdocconf | |
| parent | dcc6470466f8237cc46ac1ac39e865ec2568d702 (diff) | |
| parent | 57fa34d2c09529b71e2fdfec077c0f35e9cd7624 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
* origin/stable:
Make standalone demos work with 2d renderer
Doc: Bump version to 4.2.0
Doc: Bump version to 4.1.0
Change-Id: I48bd4df889a24fb254fa1a341f997f2c673f39d6
Diffstat (limited to 'doc/b2qt-demos.qdocconf')
| -rw-r--r-- | doc/b2qt-demos.qdocconf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/b2qt-demos.qdocconf b/doc/b2qt-demos.qdocconf index 527f8cc..6ea9867 100644 --- a/doc/b2qt-demos.qdocconf +++ b/doc/b2qt-demos.qdocconf @@ -6,7 +6,7 @@ sourceencoding = UTF-8 project = QtforDeviceCreationDemos description = Qt 5.4 for Device Creation Examples and Demos -version = 4.1.0 +version = 4.2.0 sourcedirs = . imagedirs += images @@ -21,7 +21,7 @@ exampledirs = ../basicsuite qhp.projects = QtforDeviceCreationDemos qhp.QtforDeviceCreationDemos.file = b2qt-demos.qhp -qhp.QtforDeviceCreationDemos.namespace = com.digia.b2qt-demos.410 +qhp.QtforDeviceCreationDemos.namespace = com.digia.b2qt-demos.420 qhp.QtforDeviceCreationDemos.virtualFolder = b2qt-demos qhp.QtforDeviceCreationDemos.indexTitle = Qt 5.4 for Device Creation Examples and Demos qhp.QtforDeviceCreationDemos.indexRoot = |