diff options
author | Lars Knoll <lars.knoll@qt.io> | 2016-11-21 10:44:47 +0100 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@qt.io> | 2017-02-27 10:30:55 +0000 |
commit | 95de9e6154d75688e81a3b79007dfe6c56d3b65b (patch) | |
tree | a9effd19086e8b29651414fd657d963e8de47cba /src/gsttools/qgstutils.cpp | |
parent | 8d0e08e96ffd8cd78fbb4a01f250dfb46117c636 (diff) |
Use QT_CONFIG macro to check for features
And remove many custom defines.
Change-Id: I658cc8430d1d99ed3c0aafe03a77adce76621a29
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
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 a2b35073c..2f8a39d67 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; } |