diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-10 19:26:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-10 19:26:21 +0200 |
| commit | 08e13bfcdb23eabfbc47bca7499b0b8aadce0ac7 (patch) | |
| tree | 406ffa7e3ae0a346a14175ccccb8ac7e596d8f8f /src/plugins/v4l | |
| parent | fa9fe9ff8c3aba25fbae4f8f32588dd6477d6df8 (diff) | |
| parent | f0e0d5d901d4e28fff9f29caf86ada84906b3db4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/winrt/qwinrtcameracontrol.cpp
Change-Id: I45d3042adf19577a72794610fa1c310cb22e26c4
Diffstat (limited to 'src/plugins/v4l')
| -rw-r--r-- | src/plugins/v4l/radio/v4lradiocontrol.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/v4l/radio/v4lradiocontrol.h b/src/plugins/v4l/radio/v4lradiocontrol.h index c19fc9c9c..ce68ebeec 100644 --- a/src/plugins/v4l/radio/v4lradiocontrol.h +++ b/src/plugins/v4l/radio/v4lradiocontrol.h @@ -46,7 +46,11 @@ #include <qradiotunercontrol.h> +#if defined(Q_OS_FREEBSD) +#include <sys/types.h> +#else #include <linux/types.h> +#endif #include <sys/time.h> #include <sys/ioctl.h> #include <linux/videodev2.h> |