summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2013-10-16 09:59:13 +0200
committerLaszlo Agocs <laszlo.agocs@digia.com>2013-10-16 12:31:42 +0300
commit0048bdabca4635b403da538d7745d69245ac9de3 (patch)
tree714a3aac723db5c04a31cda8e2aa5ce8b0fd6da4
parentcbe56833d10077804e1a88af85819e75eee6db3e (diff)
Doc: Various minor fixes
Change-Id: I2d00db1985a50021af704f8f52c1fd78cadc9536 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
-rw-r--r--src/doc/src/b2qt.qdoc39
1 files changed, 21 insertions, 18 deletions
diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc
index e2f6d43..b7a696c 100644
--- a/src/doc/src/b2qt.qdoc
+++ b/src/doc/src/b2qt.qdoc
@@ -440,7 +440,7 @@
Devices Android Jellybean i.MX6 images} (registration required).
Use the following commands to create a micro-SD card containing the
- dowloaded image:
+ downloaded image:
\list
\li Extract the downloaded package
@@ -553,7 +553,7 @@
\list 1
\li Open \b{File > New File or Project}, select
- \b{Qt Quick 2 Application (Built-in Types)} and click \b{Next}.
+ \b{Qt Quick 2 Application (Built-in Types)} and click \b{Choose...}.
\li In \b{Kit Selection} dialog, select the kit(s) for your
devices. You can also select the emulator kit to test running the
project in the emulator.
@@ -563,22 +563,25 @@
\li To build and run the project, click \inlineimage qtcreator-run.png
\endlist
- \section1 Setting up an already existing project for deployment
+ \section1 Setting Up an Already Existing Project for Deployment
The projects generated by Qt Creator will always have the correct settings
- for deployment on the device or emulator. Existing projects may need some
- changes however.
+ for deployment on the device or emulator. However, existing projects may
+ need some changes.
- As a general rule, application binaries and content (like QML files) are
- deployed under /data/user/qt/<APPLICATION_NAME>. This means that deployment
- settings in .pro files like the following:
+ As a general rule, application binaries and resources (such as QML files and
+ images) are deployed under \c {/data/user/qt/<APPLICATION_NAME>} directory.
+ Therefore, the \c path variable for \c INSTALLS target(s) need to be adjusted
+ accordingly in .pro files:
+
+ For example, the following:
\code
target.path = ...
INSTALLS += target
\endcode
- should be migrated to
+ should be migrated to:
\code
target.path = /data/user/qt/<APPLICATION_NAME>
@@ -626,7 +629,7 @@
time.
On some devices, for example the i.MX6 Sabre Lite, the touchscreen device is
- specified explicitly in QT_QPA_GENERIC_PLUGINS. This is necessary because
+ specified explicitly in \c QT_QPA_GENERIC_PLUGINS. This is necessary because
the automatic device discovery would fail to find the touchscreen.
\section1 Booting to a Custom Application
@@ -724,14 +727,14 @@
\section1 General Issues
- \section2 I have a problem deploying/launching the application in Qt Creator
+ \section2 I have problems deploying/launching the application in Qt Creator
Check if the device is properly connected to the PC via USB.
See \l{Connectivity Issues}.
If using the emulator, see \l{Installing VirtualBox}{Configuring VirtualBox}.
- \section2 I have a problem deploying/launching a Qt or Qt Declarative example application
+ \section2 I have problems deploying/launching a Qt or Qt Quick example application
Because of a technical peculiarity in \c{qmake}, it is not
possible to get correct deployment setup for any application that
@@ -741,7 +744,7 @@
outside the Qt source tree, and open this copy of the example
application instead.
- \section2 I have a problem launching or running applications on hardware after updating \B2Q SDK
+ \section2 I have problems launching or running applications on hardware after updating the SDK
Remember to repeat the process of updating also your device with the latest
version of \B2Q. See \l{Installing Boot to Qt on Target Devices}.
@@ -803,13 +806,13 @@
\section2 Application stops with \e{EGLFS: OpenGL windows cannot be mixed with others.}
- In OpenGL and Qt Quick 2 applications there can only be one
+ OpenGL and Qt Quick 2 applications can only have one
fullscreen window existing at a time. Trying to create another
- OpenGL window or trying to mix an OpenGL window with raster ones
- will abort the application with the message shown above.
+ OpenGL window, or trying to mix an OpenGL window with a raster one
+ will display the above message and abort the application.
- For raster (software rendered, e.g. QtWidget or QPainter-based
- content) windows there is no such limitation.
+ \note For raster windows (software rendered content based on QWidget or
+ QPainter), there is no such limitation.
\section2 I cannot edit the contents of appcontroller.conf on the device