diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-06-27 12:00:33 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-05 06:49:59 +0200 |
| commit | d502dec45604ba77d997061bc7f4f6f688c42f9f (patch) | |
| tree | 71d56a1cd13b378430e5be68a4ae2e251d276245 /src | |
| parent | 1fa94883ed2df22f68f77992f1ef9b4e491f3764 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimediakit/qcameraviewfinder.cpp | 2 | ||||
| -rw-r--r-- | src/multimediakit/video/qvideosurfaceformat.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/multimediakit/qcameraviewfinder.cpp b/src/multimediakit/qcameraviewfinder.cpp index dc779c60d..86136163e 100644 --- a/src/multimediakit/qcameraviewfinder.cpp +++ b/src/multimediakit/qcameraviewfinder.cpp @@ -107,8 +107,6 @@ QMediaObject *QCameraViewfinder::mediaObject() const */ bool QCameraViewfinder::setMediaObject(QMediaObject *object) { - Q_D(QCameraViewfinder); - return QVideoWidget::setMediaObject(object); } diff --git a/src/multimediakit/video/qvideosurfaceformat.cpp b/src/multimediakit/video/qvideosurfaceformat.cpp index 58b2baa44..c384093ef 100644 --- a/src/multimediakit/video/qvideosurfaceformat.cpp +++ b/src/multimediakit/video/qvideosurfaceformat.cpp @@ -689,6 +689,7 @@ QDebug operator<<(QDebug dbg, const QVideoSurfaceFormat &f) break; case QVideoFrame::Format_Y16: typeName = QLatin1String("Format_Y16"); + break; default: typeName = QString(QLatin1String("UserType(%1)" )).arg(int(f.pixelFormat())); } |