diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 14:45:09 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 14:45:09 +0200 |
| commit | d07aa35bc83f710e350831738235be65addd8ab7 (patch) | |
| tree | ad8eda259a93ae666078a55016619cfc79443a29 /qtmultimedia.pro | |
| parent | 593e1b99f10e261de854766d59c3d433cbe3d088 (diff) | |
| parent | fca12620b1e14a5d2daf467f2f8c6eb96714e80a (diff) | |
| download | qtmultimedia-d07aa35bc83f710e350831738235be65addd8ab7.tar.gz | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ic82ed2ba60d9855f1490d4ca66451dbc42ae6e2f
Diffstat (limited to 'qtmultimedia.pro')
| -rw-r--r-- | qtmultimedia.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qtmultimedia.pro b/qtmultimedia.pro index f4aab579d..ed4a1bfc9 100644 --- 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) |