diff options
| author | Christian Strømme <christian.stromme@digia.com> | 2014-05-15 13:57:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-04 13:19:28 +0200 |
| commit | 1ef3ef6a30e6cb38e332da6cc62aea18248e9eae (patch) | |
| tree | af19d9b3a3f915a2ede574aafcb06dce76d4cb73 | |
| parent | 92147420124f28c4c844b4603de7ab412e084d9f (diff) | |
| download | qtmultimedia-1ef3ef6a30e6cb38e332da6cc62aea18248e9eae.tar.gz | |
Make it possible to build multimedia for embedded Android
Change-Id: I3400b18379242ea4d1b4f94f5da6b60c64d551e4
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| -rw-r--r-- | qtmultimedia.pro | 2 | ||||
| -rw-r--r-- | src/plugins/android/android.pro | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qtmultimedia.pro b/qtmultimedia.pro index 1deaab2aa..c7f093ccc 100644 --- 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") diff --git a/src/plugins/android/android.pro b/src/plugins/android/android.pro index 807f8ece8..fa322942b 100644 --- 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 |