diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2014-11-07 13:30:29 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2014-11-07 17:19:09 +0100 |
| commit | 31d57b6d9d39d7fdc03526c9703d0b4010d512c5 (patch) | |
| tree | 9471839273c0505026c9564c57070c609dbd20b7 /qtmultimedia.pro | |
| parent | 58cbea0f93af1e613eeeffec68d00c4df0ae4bf9 (diff) | |
| parent | c3f5a15f24f4421e0a096b2272273d9a85f70851 (diff) | |
| download | qtmultimedia-31d57b6d9d39d7fdc03526c9703d0b4010d512c5.tar.gz | |
Merge remote-tracking branch 'origin/dev' into wip/gstreamer-1.0
Conflicts:
qtmultimedia.pro
src/gsttools/qvideosurfacegstsink.cpp
src/plugins/gstreamer/camerabin/camerabinsession.cpp
src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp
Change-Id: Ib533c187c010f97f96e44eb765281afd55763a8f
Diffstat (limited to 'qtmultimedia.pro')
| -rw-r--r-- | qtmultimedia.pro | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/qtmultimedia.pro b/qtmultimedia.pro index 7b6baa5fd..84f254861 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 { @@ -29,6 +25,7 @@ win32 { qtCompileTest(gstreamer_photography) qtCompileTest(gstreamer_encodingprofiles) qtCompileTest(gstreamer_appsrc) + qtCompileTest(linux_v4l) } else { gstver=1.0 cache(GST_VERSION, set, gstver); @@ -38,6 +35,7 @@ win32 { qtCompileTest(gstreamer_photography) qtCompileTest(gstreamer_encodingprofiles) qtCompileTest(gstreamer_appsrc) + qtCompileTest(linux_v4l) } } } |