1 files changed, 20 insertions, 22 deletions
diff --git a/tests/auto/blackbox/testdata-android/teapot/teapot.qbs b/tests/auto/blackbox/testdata-android/teapot/teapot.qbs
index 81772fb71..69e06a032 100644
--- a/tests/auto/blackbox/testdata-android/teapot/teapot.qbs
+++ b/tests/auto/blackbox/testdata-android/teapot/teapot.qbs
@@ -76,9 +76,10 @@ Project {
         }
     }
 
-    DynamicLibrary {
+    CppApplication {
         name: "TeapotNativeActivity"
         qbs.targetPlatform: "android"
+
         Depends { name: "Android.ndk" }
         Depends { name: "cpp" }
         Depends { name: "android_cpufeatures" }
@@ -86,6 +87,21 @@ Project {
         Depends { name: "ndk-helper" }
 
         Probe {
+            id: teapotProbe
+            property string samplesDir: Android.sdk.ndkSamplesDir
+            property string dir
+            configure: {
+                var paths = ["/teapots/classic-teapot/src/main", "/Teapot/app/src/main", "/Teapot"];
+                for (var i = 0; i < paths.length; ++i) {
+                    if (File.exists(samplesDir + paths[i])) {
+                        dir = samplesDir + paths[i];
+                        break;
+                    }
+                }
+            }
+        }
+
+        Probe {
             id: teapotProbeJni
             property string samplesDir: Android.ndk.ndkSamplesDir
             property string jniDir
@@ -114,6 +130,9 @@ Project {
 
         FileTagger { patterns: ["*.inl"]; fileTags: ["hpp"] }
 
+        Android.sdk.apkBaseName: name
+        Android.sdk.packageName: "com.sample.teapot"
+        Android.sdk.sourceSetDir: teapotProbe.dir
         Android.ndk.appStl: "gnustl_shared"
         cpp.cxxLanguageVersion: "c++11"
         cpp.dynamicLibraries: ["log", "android", "EGL", "GLESv2"]
@@ -123,25 +142,4 @@ Project {
         // Refer to: https://github.com/android-ndk/ndk/issues/381
         cpp.linkerFlags: ["-u", "ANativeActivity_onCreate"]
     }
-
-    AndroidApk {
-        Probe {
-            id: teapotProbe
-            property string samplesDir: Android.sdk.ndkSamplesDir
-            property string dir
-            configure: {
-                var paths = ["/teapots/classic-teapot/src/main", "/Teapot/app/src/main", "/Teapot"];
-                for (var i = 0; i < paths.length; ++i) {
-                    if (File.exists(samplesDir + paths[i])) {
-                        dir = samplesDir + paths[i];
-                        break;
-                    }
-                }
-            }
-        }
-
-        name: "com.sample.teapot"
-        sourceSetDir: teapotProbe.dir
-        Depends { productTypes: ["android.nativelibrary"] }
-    }
 }