slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make it possible to build multimedia for embedded Android

Browse Source 
Change-Id: I3400b18379242ea4d1b4f94f5da6b60c64d551e4
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This commit is contained in:
Christian Strømme
2014-05-15 13:57:34 +02:00
committed by The Qt Project
parent 9214742012
commit 1ef3ef6a30
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qtmultimedia.pro
View File

@@ -12,7 +12,7 @@ win32 {
qtCompileTest(evr) qtCompileTest(evr)
} else:mac { } else:mac {
qtCompileTest(avfoundation) qtCompileTest(avfoundation)
} else:android { } else:android:!android-no-sdk {
SDK_ROOT = $$(ANDROID_SDK_ROOT) SDK_ROOT = $$(ANDROID_SDK_ROOT)
isEmpty(SDK_ROOT): SDK_ROOT = $$DEFAULT_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") !exists($$SDK_ROOT/platforms/android-11/android.jar): error("QtMultimedia for Android requires API level 11")

4
src/plugins/android/android.pro
View File

@@ -1,7 +1,7 @@
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS += src \ SUBDIRS += src
jar android:!android-no-sdk: SUBDIRS += jar
qtHaveModule(quick) { qtHaveModule(quick) {
SUBDIRS += videonode SUBDIRS += videonode