summaryrefslogtreecommitdiffstats
path: root/config.tests/linux_v4l/linux_v4l.pro
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-08-28 16:25:20 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-09-01 12:52:51 +0200
commit659f238bbbe040cce1bdf900f8f5500845ca8727 (patch)
tree7990072bf39b2c19df68bcd7615242d08eb8dd2f /config.tests/linux_v4l/linux_v4l.pro
parent80ba1d635dc37963b4c90d776c46774b0349c4f8 (diff)
parent1dba07b602ef8b3fd9333a8afb1db4cbaf9d824e (diff)
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 'config.tests/linux_v4l/linux_v4l.pro')
-rw-r--r--config.tests/linux_v4l/linux_v4l.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/config.tests/linux_v4l/linux_v4l.pro b/config.tests/linux_v4l/linux_v4l.pro
new file mode 100644
index 000000000..28dcadcbf
--- /dev/null
+++ b/config.tests/linux_v4l/linux_v4l.pro
@@ -0,0 +1 @@
+SOURCES += main.cpp