aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/blackbox/testdata-android
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/blackbox/testdata-android')
-rw-r--r--tests/auto/blackbox/testdata-android/minimal-native/minimal-native.qbs2
-rw-r--r--tests/auto/blackbox/testdata-android/minimal-native/src/main/java/my/minimal/MinimalNative.java (renamed from tests/auto/blackbox/testdata-android/minimal-native/src/main/java/minimal/MinimalNative.java)0
-rw-r--r--tests/auto/blackbox/testdata-android/qml-app/qml-app.qbs2
3 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata-android/minimal-native/minimal-native.qbs b/tests/auto/blackbox/testdata-android/minimal-native/minimal-native.qbs
index 8cdda7a3c..570152707 100644
--- a/tests/auto/blackbox/testdata-android/minimal-native/minimal-native.qbs
+++ b/tests/auto/blackbox/testdata-android/minimal-native/minimal-native.qbs
@@ -2,6 +2,8 @@ CppApplication {
name: "minimalnative"
qbs.buildVariant: "release"
Properties { condition: qbs.toolchain.contains("clang"); Android.ndk.appStl: "c++_shared" }
+ Android.sdk.packageName: "my.minimalnative"
+ Android.sdk.apkBaseName: name
Android.ndk.appStl: "stlport_shared"
files: "src/main/native/native.c"
Group {
diff --git a/tests/auto/blackbox/testdata-android/minimal-native/src/main/java/minimal/MinimalNative.java b/tests/auto/blackbox/testdata-android/minimal-native/src/main/java/my/minimal/MinimalNative.java
index 1464d2593..1464d2593 100644
--- a/tests/auto/blackbox/testdata-android/minimal-native/src/main/java/minimal/MinimalNative.java
+++ b/tests/auto/blackbox/testdata-android/minimal-native/src/main/java/my/minimal/MinimalNative.java
diff --git a/tests/auto/blackbox/testdata-android/qml-app/qml-app.qbs b/tests/auto/blackbox/testdata-android/qml-app/qml-app.qbs
index 56b9d6eaf..e91a14902 100644
--- a/tests/auto/blackbox/testdata-android/qml-app/qml-app.qbs
+++ b/tests/auto/blackbox/testdata-android/qml-app/qml-app.qbs
@@ -6,6 +6,8 @@ QtApplication {
condition: qbs.targetOS.contains("android")
Qt.android_support.extraPrefixDirs: path
}
+ Android.sdk.packageName: "my.qmlapp"
+ Android.sdk.apkBaseName: name
property stringList qmlImportPaths: path
files: [
"main.cpp",