summaryrefslogtreecommitdiffstats
path: root/src/doc
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2014-01-21 10:37:56 +0100
committerTopi Reiniƶ <topi.reinio@digia.com>2014-01-28 12:55:27 +0200
commit6873ff8924ff9adcb065bddfd772eb71054b5b73 (patch)
tree16bb2eefc6fe733b141eb999b5677dbe060c6724 /src/doc
parent5055a8b531cee74ccf3bd4b82d7024f93e5f7d28 (diff)
Doc: Bump B2Qt version in the docs to 2.0.0
Set the b2qt version in the docs to 2.0.0. Also add dependencies to other doc modules, which may be useful in the future. Change-Id: I2034c893a3cce7d19c4a7198a34ebfc532aecddb Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
Diffstat (limited to 'src/doc')
-rw-r--r--src/doc/config/b2qt.qdocconf7
-rw-r--r--src/doc/src/b2qt.qdoc22
2 files changed, 16 insertions, 13 deletions
diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf
index 830d44b..7c97275 100644
--- a/src/doc/config/b2qt.qdocconf
+++ b/src/doc/config/b2qt.qdocconf
@@ -6,17 +6,20 @@ sourceencoding = UTF-8
project = QtEnterpriseEmbedded
description = Qt Enterprise Embedded Documentation
-version = 1.0.0
+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.100
+qhp.B2Qt.namespace = com.digia.b2qt.200
qhp.B2Qt.virtualFolder = b2qt
qhp.B2Qt.indexTitle = Qt Enterprise Embedded Documentation
qhp.B2Qt.indexRoot =
diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc
index e7ef357..34ae33d 100644
--- a/src/doc/src/b2qt.qdoc
+++ b/src/doc/src/b2qt.qdoc
@@ -335,9 +335,9 @@
\code
cd <INSTALL_DIR>
- sudo ./Tools/b2qt/fastboot flash boot Boot2Qt-1.0/nexus7-eAndroid/images/boot.img
- sudo ./Tools/b2qt/fastboot flash system Boot2Qt-1.0/nexus7-eAndroid/images/system.img
- sudo ./Tools/b2qt/fastboot flash userdata Boot2Qt-1.0/nexus7-eAndroid/images/data.img
+ sudo ./Tools/b2qt/fastboot flash boot Boot2Qt-2.x/nexus7-eAndroid/images/boot.img
+ sudo ./Tools/b2qt/fastboot flash system Boot2Qt-2.x/nexus7-eAndroid/images/system.img
+ sudo ./Tools/b2qt/fastboot flash userdata Boot2Qt-2.x/nexus7-eAndroid/images/data.img
\endcode
\li Once the flashing is completed successfully, reboot the device:
@@ -359,7 +359,7 @@
{https://developers.google.com/android/nexus/drivers#grouperjdq39}
\code
cd <INSTALL_DIR>
- ./Boot2Qt-1.0/nexus7-eAndroid/images/download.sh
+ ./Boot2Qt-2.x/nexus7-eAndroid/images/download.sh
\endcode
\note Only the version "Android 4.2.2 (JDQ39 to JDQ39E)" works with the
@@ -372,7 +372,7 @@
Also check that the device is \e{not} in fastboot mode.
\li Run the driver extractors:
\code
- cd Boot2Qt-1.0/nexus7-eAndroid/images/drivers
+ cd Boot2Qt-2.x/nexus7-eAndroid/images/drivers
./extract-nvidia-grouper.sh
./extract-asus-grouper.sh
./extract-invensense-grouper.sh
@@ -386,7 +386,7 @@
\endcode
\li Deploy the drivers to your device:
\code
- ./Boot2Qt-1.0/nexus7-eAndroid/images/deploy.sh <serial_number>
+ ./Boot2Qt-2.x/nexus7-eAndroid/images/deploy.sh <serial_number>
\endcode
\endlist
@@ -440,12 +440,12 @@
\li \b{\B2QA}
\code
cd <INSTALL_DIR>
- sudo dd if=Boot2Qt-1.0/beagleboard-eAndroid/images/sdcard.img of=/dev/<device_name> bs=1M
+ sudo dd if=Boot2Qt-2.x/beagleboard-eAndroid/images/sdcard.img of=/dev/<device_name> bs=1M
\endcode
\li \b{\B2QL}
\code
cd <INSTALL_DIR>
- sudo Boot2Qt-1.0/beagleboard-eLinux/images/deploy.sh /dev/<device_name>
+ sudo Boot2Qt-2.x/beagleboard-eLinux/images/deploy.sh /dev/<device_name>
\endcode
\endlist
@@ -528,12 +528,12 @@
\li \b{\B2QA}
\code
cd <INSTALL_DIR>
- Boot2Qt-1.0/iMX6-eAndroid/images/deploy.sh /dev/<device_name>
+ Boot2Qt-2.x/iMX6-eAndroid/images/deploy.sh /dev/<device_name>
\endcode
\li \b{\B2QL}
\code
cd <INSTALL_DIR>
- Boot2Qt-1.0/iMX6-eLinux/images/deploy.sh /dev/<device_name>
+ Boot2Qt-2.x/iMX6-eLinux/images/deploy.sh /dev/<device_name>
\endcode
\endlist
@@ -585,7 +585,7 @@
\code
cd <INSTALL_DIR>
- sudo Boot2Qt-1.0/raspberrypi-eLinux/images/deploy.sh /dev/<device_name>
+ sudo Boot2Qt-2.x/raspberrypi-eLinux/images/deploy.sh /dev/<device_name>
\endcode
After the image has been deployed, power on the device and check that