Don't rely on a qbs-autotests_android profile for autotests

Instead, simply set the qbs.targetPlatform property for the relevant
products.

Change-Id: Ia39cf6d4f729783b0d7fb85a83023f438b9e3e20
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

4 files changed, 10 insertions, 0 deletions

diff --git a/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product1/product1.qbs b/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product1/product1.qbs
index 0ddd7526c..63256af54 100644
--- a/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product1/product1.qbs
+++ b/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product1/product1.qbs
@@ -6,6 +6,7 @@ Project {
         Depends { name: "cpp" }
         name: "p1lib1"
         files: ["src/main/jni/lib1.cpp"]
+        qbs.targetPlatform: "android"
         Android.ndk.appStl: "stlport_shared"
         qbs.architectures: !qbs.architecture ? ["mips", "x86"] : undefined
         cpp.useRPaths: false
@@ -16,6 +17,7 @@ Project {
         Depends { name: "cpp" }
         name: "p1lib2"
         files: ["src/main/jni/lib2.cpp"]
+        qbs.targetPlatform: "android"
         Android.ndk.appStl: "stlport_shared"
         cpp.useRPaths: false
     }
diff --git a/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product2/product2.qbs b/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product2/product2.qbs
index f0418a425..a4f94f671 100644
--- a/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product2/product2.qbs
+++ b/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product2/product2.qbs
@@ -5,6 +5,7 @@ Project {
         Depends { name: "cpp" }
         name: "p2lib1"
         files: ["src/main/jni/lib1.cpp"]
+        qbs.targetPlatform: "android"
         cpp.useRPaths: false
     }
 
@@ -13,6 +14,7 @@ Project {
         Depends { name: "cpp" }
         name: "p2lib2"
         files: ["src/main/jni/lib2.cpp"]
+        qbs.targetPlatform: "android"
         Android.ndk.appStl: "stlport_shared"
     }
 
diff --git a/tests/auto/blackbox/testdata-android/multiple-libs-per-apk/multiple-libs-per-apk.qbs b/tests/auto/blackbox/testdata-android/multiple-libs-per-apk/multiple-libs-per-apk.qbs
index d76a41232..499a5111b 100644
--- a/tests/auto/blackbox/testdata-android/multiple-libs-per-apk/multiple-libs-per-apk.qbs
+++ b/tests/auto/blackbox/testdata-android/multiple-libs-per-apk/multiple-libs-per-apk.qbs
@@ -6,6 +6,7 @@ Project {
         Depends { name: "cpp" }
         name: "lib1"
         files: ["src/main/jni/lib1.cpp"]
+        qbs.targetPlatform: "android"
         Android.ndk.appStl: "stlport_shared"
         cpp.useRPaths: false
     }
@@ -15,6 +16,7 @@ Project {
         Depends { name: "cpp" }
         name: "lib2"
         files: ["src/main/jni/lib2.cpp"]
+        qbs.targetPlatform: "android"
         Android.ndk.appStl: "stlport_shared"
         cpp.useRPaths: false
     }
diff --git a/tests/auto/blackbox/testdata-android/teapot/teapot.qbs b/tests/auto/blackbox/testdata-android/teapot/teapot.qbs
index 7df17226e..4a447b2cc 100644
--- a/tests/auto/blackbox/testdata-android/teapot/teapot.qbs
+++ b/tests/auto/blackbox/testdata-android/teapot/teapot.qbs
@@ -5,6 +5,7 @@ Project {
     minimumQbsVersion: qbs.version
     StaticLibrary {
         name: "native-glue"
+        qbs.targetPlatform: "android"
         Depends { name: "cpp" }
         Group {
             id: glue_sources
@@ -21,6 +22,7 @@ Project {
 
     StaticLibrary {
         name: "ndk-helper"
+        qbs.targetPlatform: "android"
         Depends { name: "Android.ndk" }
         Depends { name: "cpp" }
         Depends { name: "native-glue" }
@@ -60,6 +62,7 @@ Project {
 
     StaticLibrary {
         name: "android_cpufeatures"
+        qbs.targetPlatform: "android"
         Depends { name: "cpp" }
         Group {
             id: cpufeatures_sources
@@ -76,6 +79,7 @@ Project {
 
     DynamicLibrary {
         name: "TeapotNativeActivity"
+        qbs.targetPlatform: "android"
         Depends { name: "Android.ndk" }
         Depends { name: "cpp" }
         Depends { name: "android_cpufeatures" }