Enable the Application item to create Android apps

The formerly required AndroidApk item is no longer needed: We just tag
the APK file as an application and let the Application item pull in the
Android.sdk module for Android targets.
It is also possible to have native code directly in the Application
product; in that case, the multiplexed variants become dynamic libraries
and the APK file is built for the aggregate.

[ChangeLog] The AndroidApk item was deprecated, a normal Application
item can be used instead.

Change-Id: I04f5f3892f354ca9eb4f2da8055abcd8d072aba0
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 8 insertions, 14 deletions

diff --git a/doc/reference/modules/android-ndk-module.qdoc b/doc/reference/modules/android-ndk-module.qdoc
index 032cca97f..08f54a9c9 100644
--- a/doc/reference/modules/android-ndk-module.qdoc
+++ b/doc/reference/modules/android-ndk-module.qdoc
@@ -34,27 +34,21 @@
     \brief Provides support for building native Android libraries.
 
     The \c Android.ndk module contains the properties and rules to create native libraries
-    for use in \l{AndroidApk}{Android application packages}.
+    for use in Android applications.
 
     Normally, you will not use this module directly, but instead work
-    with the \l{DynamicLibrary} and \l{StaticLibrary} items that \QBS provides.
+    with the \l{DynamicLibrary}, \l{StaticLibrary} and \l Application items
+    that \QBS provides.
 
     Here is what the project file for the \c hello-jni example that comes with
     the NDK could look like:
 
     \code
-        Project {
-            DynamicLibrary {
-                name: "hello-jni"
-                qbs.architectures: ["mips", "x86"]
-                files: ["jni/hello-jni.c"]
-            }
-
-            AndroidApk {
-                name: "HelloJni"
-                packageName: "com.example.hellojni"
-                Depends { productTypes: ["android.nativelibrary"] }
-            }
+        CppApplication {
+            name: "HelloJni"
+            Android.sdk.packageName: "com.example.hellojni"
+            qbs.architectures: ["mips", "x86"]
+            files: "app/src/main/jni/hello-jni.c"
         }
     \endcode