diff options
| author | Christian Strømme <christian.stromme@digia.com> | 2013-04-26 14:49:45 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-29 18:03:17 +0200 |
| commit | ffb26b07c84d99ff3b3c857d7f85cfe1b724ec45 (patch) | |
| tree | 2b62ea73709cd6a375e60a2a17680b9389ddfc58 | |
| parent | 081395a749ce4a8e5fe656c0ca4946d302018534 (diff) | |
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>
| -rw-r--r-- | config.tests/android/android.pro | 4 | ||||
| -rw-r--r-- | config.tests/android/main.java | 6 | ||||
| -rw-r--r-- | qtmultimedia.pro | 2 |
3 files changed, 12 insertions, 0 deletions
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) |