From 59e78d78c9db3aec700995e4f25ae31f7a219688 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 24 Jul 2012 14:53:25 +0200 Subject: QtMultiMedia/Tests: Fix MSVC2012 warning about overload. warning C4373: 'MockVideoSurface::supportedPixelFormats': virtual function overrides 'QAbstractVideoSurface::supportedPixelFormats', previous versions of the compiler did not override when parameters only differed by const/volatile qualifiers. Change-Id: I87701ce0a2db3d4a0ec0a98980ad231f352a2ab2 Reviewed-by: Michael Goddard --- tests/auto/unit/qmultimedia_common/mockvideosurface.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/unit/qmultimedia_common/mockvideosurface.h b/tests/auto/unit/qmultimedia_common/mockvideosurface.h index 51d758e9a..2a67fbf8a 100644 --- a/tests/auto/unit/qmultimedia_common/mockvideosurface.h +++ b/tests/auto/unit/qmultimedia_common/mockvideosurface.h @@ -48,7 +48,7 @@ class MockVideoSurface : public QAbstractVideoSurface { public: QList supportedPixelFormats( - const QAbstractVideoBuffer::HandleType) const + QAbstractVideoBuffer::HandleType = QAbstractVideoBuffer::NoHandle) const { return QList(); } -- cgit v1.2.3