Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
This commit is contained in:
@@ -104,7 +104,7 @@ QCameraInfo::QCameraInfo(const QCamera &camera)
|
||||
: d(new QCameraInfoPrivate)
|
||||
{
|
||||
const QVideoDeviceSelectorControl *deviceControl = camera.d_func()->deviceControl;
|
||||
if (deviceControl) {
|
||||
if (deviceControl && deviceControl->deviceCount() > 0) {
|
||||
const int selectedDevice = deviceControl->selectedDevice();
|
||||
d->deviceName = deviceControl->deviceName(selectedDevice);
|
||||
d->description = deviceControl->deviceDescription(selectedDevice);
|
||||
|
||||
@@ -78,6 +78,8 @@ namespace QGstUtils {
|
||||
const QSet<QString> &supportedMimeTypeSet);
|
||||
}
|
||||
|
||||
void qt_gst_object_ref_sink(gpointer object);
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user