ff527de0 was submitted to 5.3 while
cddbe873 was submitted to 5.4.
The former's behavior was not preserved when 5.3 got merged into 5.4.
Change-Id: I7435ea30634001ae6e87c316eb8a8ab6f5e988e3
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
#include <QtCore/qstringlist.h>
#include <qaudioformat.h>
-#include <private/qcore_unix_p.h>
-#include <linux/videodev2.h>
+#ifdef USE_V4L
+# include <private/qcore_unix_p.h>
+# include <linux/videodev2.h>
+#endif
#include "qgstreamervideoinputdevicecontrol_p.h"
}
}
+#ifdef USE_V4L
QDir devDir(QStringLiteral("/dev"));
devDir.setFilter(QDir::System);
}
qt_safe_close(fd);
}
+#endif // USE_V4L
return devices;
}
DEFINES += GST_USE_UNSTABLE_API #prevents warnings because of unstable photography API
}
-config_linux_v4l: DEFINES += USE_V4L
-
OTHER_FILES += \
camerabin.json
#include "camerabinserviceplugin.h"
-
#include "camerabinservice.h"
#include <private/qgstutils_p.h>
-#include <private/qcore_unix_p.h>
-
-#if defined(USE_V4L)
-#include <linux/videodev2.h>
-#endif
-
QT_BEGIN_NAMESPACE
template <typename T, int N> static int lengthOf(const T(&)[N]) { return N; }