Two minor static analysis issues.
Reviewed-by: Jonas Rabbe (cherry picked from commit f8d04d717d3d7d5d2f73cc3e8a4245130fcf600a) Change-Id: I3b12fd3a42d16730df3fe1277ba6821b5c2ef960 Reviewed-on: http://codereview.qt.nokia.com/982 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard
This commit is contained in:
committed by
Qt by Nokia
parent
1fa94883ed
commit
d502dec456
@@ -107,8 +107,6 @@ QMediaObject *QCameraViewfinder::mediaObject() const
|
|||||||
*/
|
*/
|
||||||
bool QCameraViewfinder::setMediaObject(QMediaObject *object)
|
bool QCameraViewfinder::setMediaObject(QMediaObject *object)
|
||||||
{
|
{
|
||||||
Q_D(QCameraViewfinder);
|
|
||||||
|
|
||||||
return QVideoWidget::setMediaObject(object);
|
return QVideoWidget::setMediaObject(object);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -689,6 +689,7 @@ QDebug operator<<(QDebug dbg, const QVideoSurfaceFormat &f)
|
|||||||
break;
|
break;
|
||||||
case QVideoFrame::Format_Y16:
|
case QVideoFrame::Format_Y16:
|
||||||
typeName = QLatin1String("Format_Y16");
|
typeName = QLatin1String("Format_Y16");
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
typeName = QString(QLatin1String("UserType(%1)" )).arg(int(f.pixelFormat()));
|
typeName = QString(QLatin1String("UserType(%1)" )).arg(int(f.pixelFormat()));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user