aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-08-16 16:17:44 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2018-10-19 09:17:55 +0000
commit4ebb16fa78277d23a1f571cc3485ce178588983d (patch)
tree9d1cdc694a0d1d227e8b9eae6e1a223c61652a53 /doc
parent89d5e584db040bcccab9d8c02479e437f3e37530 (diff)
Android: Enable building apps with native code and no multiplexing
Until now, we needed to either put the native part into its own product or use multiplexing with the "APK product" serving as the aggregate. Now it is also possible to use a single product without multiplexing, which is a more natural approach in the case where there is only one architecture. Change-Id: I976168c99f75ad8e4940ac61f957c64ad29f5f5c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'doc')
-rw-r--r--doc/reference/items/convenience/application.qdoc10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/reference/items/convenience/application.qdoc b/doc/reference/items/convenience/application.qdoc
index 30b3f9c73..c09d15918 100644
--- a/doc/reference/items/convenience/application.qdoc
+++ b/doc/reference/items/convenience/application.qdoc
@@ -36,13 +36,13 @@
\brief Product of the type application.
- An Application item is a \l{Product} of the \l{Product::}{type}
- \c "application".
+ An Application item is a \l{Product} representing an application.
- The target artifact of this type of product is usually an executable binary.
+ The target artifact of this type of product is usually an executable binary
+ tagged \c "application".
However, on Android, unless you set \l{Product::}{consoleApplication} to \c true,
- the application target will be an APK package, and a dependency to the
- \l{Android.sdk} module is automatically added to the product.
+ the application target will be an APK package tagged \c "android.apk", and a
+ dependency to the \l{Android.sdk} module is automatically added to the product.
*/
/*!