diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 16:25:20 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-01 12:52:51 +0200 |
| commit | 659f238bbbe040cce1bdf900f8f5500845ca8727 (patch) | |
| tree | 7990072bf39b2c19df68bcd7615242d08eb8dd2f /src/plugins/plugins.pro | |
| parent | 80ba1d635dc37963b4c90d776c46774b0349c4f8 (diff) | |
| parent | 1dba07b602ef8b3fd9333a8afb1db4cbaf9d824e (diff) | |
| download | qtmultimedia-659f238bbbe040cce1bdf900f8f5500845ca8727.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/gsttools/qgstreamervideoinputdevicecontrol.cpp
src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp
Change-Id: Ic854589562d2deeaa0ebf75840cb8a2ee32e99de
Diffstat (limited to 'src/plugins/plugins.pro')
| -rw-r--r-- | src/plugins/plugins.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 0020203c3..f03a138ec 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -44,7 +44,9 @@ unix:!mac:!android { config_alsa: SUBDIRS += alsa # v4l is turned off because it is not supported in Qt 5 - # !maemo*:SUBDIRS += v4l + # config_linux_v4l { + # !maemo*:SUBDIRS += v4l + # } } mac:!simulator { |