From ffb26b07c84d99ff3b3c857d7f85cfe1b724ec45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Str=C3=B8mme?= <christian.stromme@digia.com>
Date: Fri, 26 Apr 2013 14:49:45 +0200
Subject: [PATCH] Android: Added config tests for multimedia on android.
The Android multimedia plug-in requires API level 11 to compile, so the
config test will check and issue a message about the requirement if the
API level can't be satisfied.
Change-Id: I6c21fe1255024e853023bd8168dfa917b00c4c23
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
config.tests/android/android.pro | 4 ++++
config.tests/android/main.java | 6 ++++++
qtmultimedia.pro | 2 ++
3 files changed, 12 insertions(+)
create mode 100644 config.tests/android/android.pro
create mode 100644 config.tests/android/main.java
diff --git a/config.tests/android/android.pro b/config.tests/android/android.pro
new file mode 100644
index 000000000..dcf5df184
--- /dev/null
+++ b/config.tests/android/android.pro
@@ -0,0 +1,4 @@
+CONFIG += java
+API_VERSION = android-11
+JAVASOURCES += main.java
+
diff --git a/config.tests/android/main.java b/config.tests/android/main.java
new file mode 100644
index 000000000..1ab872599
--- /dev/null
+++ b/config.tests/android/main.java
@@ -0,0 +1,6 @@
+import android.graphics.SurfaceTexture;
+
+class BuildTest
+{
+ public static void main(String [] args) { }
+}
diff --git a/qtmultimedia.pro b/qtmultimedia.pro
index aeb97464d..53f6b9886 100644
--- a/qtmultimedia.pro
+++ b/qtmultimedia.pro
@@ -8,6 +8,8 @@ win32 {
qtCompileTest(evr)
} else:mac {
qtCompileTest(avfoundation)
+} else:android {
+ !qtCompileTest(android):error("QtMultimedia for Android requires API level 11")
} else {
qtCompileTest(alsa)
qtCompileTest(pulseaudio)
--
GitLab