Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ic82ed2ba60d9855f1490d4ca66451dbc42ae6e2f
2013-06-12 14:45:09 +02:00
parent 593e1b99f1 fca12620b1
commit d07aa35bc8
7 changed files with 69 additions and 16 deletions
--- a/qtmultimedia.pro
+++ b/qtmultimedia.pro
@@ -11,7 +11,9 @@ win32 {
 } else:mac {
    qtCompileTest(avfoundation)
 } else:android {
-    !qtCompileTest(android):error("QtMultimedia for Android requires API level 11")
+    SDK_ROOT = $$(ANDROID_SDK_ROOT)
+    isEmpty(SDK_ROOT): SDK_ROOT = $$DEFAULT_ANDROID_SDK_ROOT
+    !exists($$SDK_ROOT/platforms/android-11/android.jar): error("QtMultimedia for Android requires API level 11")
 } else {
    qtCompileTest(alsa)
    qtCompileTest(pulseaudio)