summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@digia.com>2014-08-14 15:37:28 +0200
committerChristian Stromme <christian.stromme@digia.com>2014-08-25 16:33:04 +0200
commit18e665b5a611823de13159bbaacd2134e6727180 (patch)
treecc1d03e160ecc2dce4492f8a7278297518df4a92
parent5195520a5a87ef8b5afdb980a808a5a95dad4e67 (diff)
downloadqtmultimedia-18e665b5a611823de13159bbaacd2134e6727180.tar.gz
Android: Remove api level test in qtmultimedia.pro
ANDROID_API_VERSION env. var should take precedence, if set. Change-Id: I54325852ede27ff5c1bb19b81d3d649605607de9 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
-rw-r--r--qtmultimedia.pro4
1 files changed, 0 insertions, 4 deletions
diff --git a/qtmultimedia.pro b/qtmultimedia.pro
index bec5925b5..3cec526e8 100644
--- a/qtmultimedia.pro
+++ b/qtmultimedia.pro
@@ -12,10 +12,6 @@ win32 {
qtCompileTest(evr)
} else:mac {
qtCompileTest(avfoundation)
-} 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")
} else:qnx {
qtCompileTest(mmrenderer)
} else {