diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2014-09-01 14:19:53 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-09-01 14:19:53 +0200 |
| commit | bc1fa076c944c6af3250cb7210190da42a4de6ea (patch) | |
| tree | b6948fa95abbdd4ffbb30b76c7d3c09ae07e51db /src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp | |
| parent | 0c3438c9a12fbc607eada8f938cf0ad8fdea374d (diff) | |
| parent | 659f238bbbe040cce1bdf900f8f5500845ca8727 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4v5.4.0-alpha1
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp b/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp index 4e7630b72..8c943529e 100644 --- a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp @@ -43,7 +43,10 @@ #include <private/qgstutils_p.h> #include <private/qcore_unix_p.h> + +#if defined(USE_V4L) #include <linux/videodev2.h> +#endif QT_BEGIN_NAMESPACE |