summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2014-06-26 14:12:41 +0200
committerTopi Reiniƶ <topi.reinio@digia.com>2014-06-30 16:24:40 +0300
commitdd9c79664a5d463acaad2be599b053659576aa88 (patch)
tree362d51e3954107833a7d59fa61a6a857ed1cddec
parente8f88b15069677cc93a5f5d6154137963a10d7ff (diff)
Doc: Android-specific instructions for Qt Creator Kit setup
Adjust kit selection instructions for Android injection solution, and create re-usable documentation blocks to cover eLinux, eAndroid, and both. Task-number: QTEE-65QTEE-651 Change-Id: I42a1055a76f8a9e2d8dfb053ab1272643aef5671 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
-rw-r--r--src/doc/src/b2qt-post-install-setup.qdocinc36
-rw-r--r--src/doc/src/b2qt.qdoc8
2 files changed, 40 insertions, 4 deletions
diff --git a/src/doc/src/b2qt-post-install-setup.qdocinc b/src/doc/src/b2qt-post-install-setup.qdocinc
index ec293de..0bd96dd 100644
--- a/src/doc/src/b2qt-post-install-setup.qdocinc
+++ b/src/doc/src/b2qt-post-install-setup.qdocinc
@@ -56,12 +56,14 @@
//! [setting up usb access]
//! [configuring device kit]
+//! [common config device kit]
After you have prepared the hardware, you must perform one final step
to set up the development tools in Qt Creator for your device. That is,
you must configure the correct device to be used for each build and run
\e{kit}. Connect your device to the development host via USB and launch
Qt Creator. In Qt Creator:
+//! [common config device kit]
//! [steps for device kit]
\list 1
\li Select \b{Tools > Options > Build & Run > Kits}.
@@ -73,6 +75,25 @@
//! [steps for device kit]
//! [configuring device kit]
+//! [android steps for dev kit]
+ \list 1
+ \li Select \b{Tools > Options > Build & Run > Kits}.
+ \li Select the kit with the correct Android version
+ (for example, \e {generic-4.2}).
+ \li Select the correct device in the \b{Device} field.
+ \li Select \b{OK}.
+ \endlist
+
+ If you have more than one development device that use the same Android
+ version, clone the \e generic kit and rename it after the physical device:
+
+ \list 1
+ \li Select the generic Android kit and then \b Clone.
+ \li Select the correct device in the \b{Device} field.
+ \li Edit the name of the cloned kit and press \b OK.
+ \endlist
+//! [android steps for dev kit]
+
//! [configuring network device]
After you have prepared the hardware, you must set up the development tools
in Qt Creator for your device. Connect your device to the network via an
@@ -93,4 +114,19 @@
\include b2qt-post-install-setup.qdocinc steps for device kit
//! [configuring network device]
+
+//! [configuring device kit android]
+ \include b2qt-post-install-setup.qdocinc common config device kit
+ \include b2qt-post-install-setup.qdocinc android steps for dev kit
+//! [configuring device kit android]
+
+//! [configuring device kit android linux]
+ \include b2qt-post-install-setup.qdocinc common config device kit
+ \list
+ \li \b{\B2QL}
+ \include b2qt-post-install-setup.qdocinc steps for device kit
+ \li \b{\B2QA}
+ \include b2qt-post-install-setup.qdocinc android steps for dev kit
+ \endlist
+//! [configuring device kit android linux]
*/
diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc
index 185a606..b25616f 100644
--- a/src/doc/src/b2qt.qdoc
+++ b/src/doc/src/b2qt.qdoc
@@ -290,7 +290,7 @@
\section1 6. Configuring a Device Kit in Qt Creator
- \include b2qt-post-install-setup.qdocinc configuring device kit
+ \include b2qt-post-install-setup.qdocinc configuring device kit android linux
You are now ready to start developing for your device.
For more information, see \l{Building and Running an Example}.
@@ -400,7 +400,7 @@
\section1 Configuring a Device Kit in Qt Creator
- \include b2qt-post-install-setup.qdocinc configuring device kit
+ \include b2qt-post-install-setup.qdocinc configuring device kit android
You are now ready to start developing for your device. For more information,
see \l{Building and Running an Example}.
@@ -545,7 +545,7 @@
\section1 Configuring a Device Kit in Qt Creator
- \include b2qt-post-install-setup.qdocinc configuring device kit
+ \include b2qt-post-install-setup.qdocinc configuring device kit android linux
You are now ready to start developing for your device. For more information,
see \l{Building and Running an Example}.
@@ -795,7 +795,7 @@
\section1 Configuring a Device Kit in Qt Creator
- \include b2qt-post-install-setup.qdocinc configuring device kit
+ \include b2qt-post-install-setup.qdocinc configuring device kit android linux
You are now ready to start developing for your device. For more information,
see \l{Building and Running an Example}.