diff options
| -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 |