diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:27 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:51:09 +0100 |
| commit | e964e89331f2cfef99a3f63172a127b6c02a9727 (patch) | |
| tree | 4c7d78573d17e523e4278027cee8fa88494366c8 /src/gsttools/qgstutils.cpp | |
| parent | f09d36708fdab70ad51af374a65ddded64525f67 (diff) | |
| parent | 6f7192a048432e4792330244b74a2a39ccd8d515 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/plugins/gstreamer/camerabin/camerabincontainer.h
Change-Id: I4942d41d69112335fe0c994002f1b32ef3aad051
Diffstat (limited to 'src/gsttools/qgstutils.cpp')
| -rw-r--r-- | src/gsttools/qgstutils.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp index 902c71013..cb6048818 100644 --- a/src/gsttools/qgstutils.cpp +++ b/src/gsttools/qgstutils.cpp @@ -37,6 +37,7 @@ ** ****************************************************************************/ +#include <QtMultimedia/private/qtmultimediaglobal_p.h> #include "qgstutils_p.h" #include <QtCore/qdatetime.h> @@ -58,7 +59,7 @@ template<typename T, int N> static int lengthOf(const T (&)[N]) { return N; } -#ifdef USE_V4L +#if QT_CONFIG(linux_v4l) # include <private/qcore_unix_p.h> # include <linux/videodev2.h> #endif @@ -620,7 +621,7 @@ QVector<QGstUtils::CameraInfo> QGstUtils::enumerateCameras(GstElementFactory *fa } } -#ifdef USE_V4L +#if QT_CONFIG(linux_v4l) QDir devDir(QStringLiteral("/dev")); devDir.setFilter(QDir::System); @@ -675,7 +676,7 @@ QVector<QGstUtils::CameraInfo> QGstUtils::enumerateCameras(GstElementFactory *fa qt_safe_close(fd); } camerasCacheAgeTimer.restart(); -#endif // USE_V4L +#endif // linux_v4l return devices; } |