diff options
author | Topi Reinio <topi.reinio@digia.com> | 2014-12-08 14:02:44 +0100 |
---|---|---|
committer | Topi Reiniö <topi.reinio@digia.com> | 2014-12-08 15:29:15 +0200 |
commit | cce482c6e26f5c16585dd38fb9852e30336acf52 (patch) | |
tree | b60fcb572d45fbc5d8129820b52954de2f6019f7 | |
parent | b04998b4dc585216e69443165721c19fe479da94 (diff) |
Doc: Fix issues with the demo documentation
- Rename the title page to index.html to ensure Qt Creator
finds it.
- Rename docs to Qt for Device Creation Examples and Demos
- Edit strings in about-b2qt demo accordingly
Task-number: QTEE-864
Change-Id: I59bcac8b2be97baa28329cb95c8e931df6abacd2
Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
-rw-r--r-- | basicsuite/about-b2qt/AboutBoot2Qt.qml | 14 | ||||
-rw-r--r-- | basicsuite/about-b2qt/description.txt | 2 | ||||
-rw-r--r-- | basicsuite/about-b2qt/title.txt | 2 | ||||
-rw-r--r-- | doc/b2qt-demos.qdoc | 13 | ||||
-rw-r--r-- | doc/b2qt-demos.qdocconf | 24 |
5 files changed, 28 insertions, 27 deletions
diff --git a/basicsuite/about-b2qt/AboutBoot2Qt.qml b/basicsuite/about-b2qt/AboutBoot2Qt.qml index 76da891..5dc7fd7 100644 --- a/basicsuite/about-b2qt/AboutBoot2Qt.qml +++ b/basicsuite/about-b2qt/AboutBoot2Qt.qml @@ -57,13 +57,13 @@ Column { property color qtred: '#b40000' ColouredTitle { - text: "MEET Qt ENTERPRISE EMBEDDED" + text: "MEET Qt FOR DEVICE CREATION" } ContentText { id: brief width: parent.width - text: '<p align="justify">Qt Enterprise Embedded provides a fully-integrated solution + text: '<p align="justify">Qt for Device Creation provides a fully-integrated solution to get you started immediately with software development on your embedded device with a tailored user experience for embedded Linux and embedded Android. It supports your key requirements for high performance and minimal footprint, and together @@ -110,7 +110,7 @@ Column { text: '<p align="justify">Leverage the cross-platform C++ native APIs for maximum performance on both beautiful user interfaces as well as non-GUI operations. With C++, you have full control over your application code and direct device access. You can also create custom configurations - of Qt Enterprise Embedded, targeting a large variety of supported hardware and + of Qt for Device Creation, targeting a large variety of supported hardware and operating systems with ease. As with any Qt project, the same application can be deployed natively to desktop and mobile OS targets as well.</p>' } @@ -165,7 +165,7 @@ Column { with Qt’s flexible full-framework modular architecture to deliver unparalleled scalability.</p><p align="justify">The Boot to Qt stack can be made to run on a variety of hardware with the provided <strong>Build-Your-Own-Stack</strong> tooling. It comes - pre-built for several reference devices with the installation of Qt Enterprise Embedded.</p>' + pre-built for several reference devices with the installation of Qt for Device Creation.</p>' } Column { @@ -186,7 +186,7 @@ Column { ContentText { width: parent.width text: '<p align="justify">The Qt libraries come with a lot of high-level functionality for - various parts of your application. On top of that, we\'ve extended Qt Enterprise Embedded + various parts of your application. On top of that, we\'ve extended Qt for Device Creation to contain all the important things you need to create your embedded device, such as:</p>' } @@ -256,7 +256,7 @@ Column { } ContentText { width: parent.width - text: '<p align="justify">With Qt Enterprise Embedded you are never alone with your device creation. You get + text: '<p align="justify">With Qt for Device Creation you are never alone with your device creation. You get <strong>full support and portfolio of Digia Qt Professional Services</strong> to help you pass all obstacles and reach your markets faster with outstanding quality.</p>' } @@ -267,7 +267,7 @@ Column { ContentText { width: parent.width text: '<p align="justify">Play around with the demos in this launcher to see the power of Qt and get your - free evaluation version of Qt Enterprise Embedded with the Boot to Qt images + free evaluation version of Qt for Device Creation with the Boot to Qt images for common developer boards from</p>' } HighlightText { diff --git a/basicsuite/about-b2qt/description.txt b/basicsuite/about-b2qt/description.txt index df6f286..55dd359 100644 --- a/basicsuite/about-b2qt/description.txt +++ b/basicsuite/about-b2qt/description.txt @@ -1 +1 @@ -The "About Qt Enterprise Embedded" provides an introduction to what Qt Enterprise Embedded is all about. +Provides an introduction to what Qt for Device Creation is all about. diff --git a/basicsuite/about-b2qt/title.txt b/basicsuite/about-b2qt/title.txt index bc7bf4b..33ee752 100644 --- a/basicsuite/about-b2qt/title.txt +++ b/basicsuite/about-b2qt/title.txt @@ -1 +1 @@ -000. About Qt Enterprise Embedded +000. About Qt for Device Creation diff --git a/doc/b2qt-demos.qdoc b/doc/b2qt-demos.qdoc index cc9a6b4..1bf2515 100644 --- a/doc/b2qt-demos.qdoc +++ b/doc/b2qt-demos.qdoc @@ -18,9 +18,8 @@ ****************************************************************************/ /*! - \contentspage{b2qt-demos.html}{Qt Enterprise Embedded Examples and Demos} - \group b2qt-demos - \title Qt Enterprise Embedded Examples and Demos + \page index.html + \title Qt 5.4 for Device Creation Examples and Demos \SDK has a number of examples and demos. These are included in the \B2Q images, available in the launcher that is run by default at @@ -28,17 +27,19 @@ In Qt Creator, you can find and open them from \b Welcome > \b Examples by selecting a \c {Boot2Qt} version of Qt from the drop-down list. + + \annotatedlist b2qt-demos */ /*! \example about-b2qt - \title About Qt Enterprise Embedded + \title About Qt for Device Creation \ingroup b2qt-demos - \brief Displays information about Qt Enterprise Embedded. + \brief Displays information about Qt for Device Creation. \image b2qt-demo-about-b2qt.jpg - A demo that provides an introduction to what Qt Enterprise Embedded is all about. + A demo that provides an introduction to what Qt for Device Creation is all about. */ /*! diff --git a/doc/b2qt-demos.qdocconf b/doc/b2qt-demos.qdocconf index 438606d..caf1a02 100644 --- a/doc/b2qt-demos.qdocconf +++ b/doc/b2qt-demos.qdocconf @@ -4,8 +4,8 @@ naturallanguage = en_US outputencoding = UTF-8 sourceencoding = UTF-8 -project = QtEnterpriseEmbeddedDemos -description = Qt Enterprise Embedded Examples and Demos +project = QtforDeviceCreationDemos +description = Qt 5.4 for Device Creation Examples and Demos version = 4.0.0 sourcedirs = . @@ -18,21 +18,21 @@ examples.imageextensions = "*.png *.jpg *.gif" exampledirs = ../basicsuite -qhp.projects = QtEnterpriseEmbeddedDemos +qhp.projects = QtforDeviceCreationDemos -qhp.QtEnterpriseEmbeddedDemos.file = b2qt-demos.qhp -qhp.QtEnterpriseEmbeddedDemos.namespace = com.digia.b2qt-demos.400 -qhp.QtEnterpriseEmbeddedDemos.virtualFolder = b2qt-demos -qhp.QtEnterpriseEmbeddedDemos.indexTitle = Qt Enterprise Embedded Examples and Demos -qhp.QtEnterpriseEmbeddedDemos.indexRoot = +qhp.QtforDeviceCreationDemos.file = b2qt-demos.qhp +qhp.QtforDeviceCreationDemos.namespace = com.digia.b2qt-demos.400 +qhp.QtforDeviceCreationDemos.virtualFolder = b2qt-demos +qhp.QtforDeviceCreationDemos.indexTitle = Qt 5.4 for Device Creation Examples and Demos +qhp.QtforDeviceCreationDemos.indexRoot = -qhp.QtEnterpriseEmbeddedDemos.subprojects = demos +qhp.QtforDeviceCreationDemos.subprojects = demos manifestmeta.filters = b2qt manifestmeta.b2qt.tags = "b2qt,qtee" -manifestmeta.b2qt.names = "QtEnterpriseEmbeddedDemos/*" +manifestmeta.b2qt.names = "QtforDeviceCreationDemos/*" macro.B2Q = "Boot to Qt" -macro.SDK = "Qt Enterprise Embedded" +macro.SDK = "Qt for Device Creation" -navigation.landingpage = "Qt Enterprise Embedded Examples and Demos" +navigation.landingpage = "Qt 5.4 for Device Creation Examples and Demos" |