Make it possible to build multimedia for embedded Android

Change-Id: I3400b18379242ea4d1b4f94f5da6b60c64d551e4 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-05-15 13:57:34 +02:00
parent 9214742012
commit 1ef3ef6a30
2 changed files with 3 additions and 3 deletions
--- a/qtmultimedia.pro
+++ b/qtmultimedia.pro
@@ -12,7 +12,7 @@ win32 {
    qtCompileTest(evr)
 } else:mac {
    qtCompileTest(avfoundation)
-} else:android {
+} else:android:!android-no-sdk {
    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")
--- a/src/plugins/android/android.pro
+++ b/src/plugins/android/android.pro
@@ -1,7 +1,7 @@
 TEMPLATE = subdirs

-SUBDIRS += src \
-           jar
+SUBDIRS += src
+android:!android-no-sdk: SUBDIRS += jar

 qtHaveModule(quick) {
    SUBDIRS += videonode