From f97d5eaaa539e2569f3ca3b8eef6649827b07bc1 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 21 Apr 2017 15:37:59 +0200 Subject: DirectShow: Fix namespaced build with MinGW Remove QT_USE_NAMESPACE from headers and enclose headers/sources in QT_BEGIN/END_NAMESPACE. Fixes MinGW build error: qtbase/src/corelib/global/qtypeinfo.h:246:7: error: specialization of 'template class tn::QTypeInfo' in different namespace [-fpermissive] class QTypeInfo \ ^ qtbase/src/corelib/global/qtypeinfo.h:265:1: note: in expansion of macro 'Q_DECLARE_TYPEINFO_BODY' Q_DECLARE_TYPEINFO_BODY(TYPE, FLAGS) ^ helpers\directshowmediatype.h:92:1: note: in expansion of macro 'Q_DECLARE_TYPEINFO' Q_DECLARE_TYPEINFO(DirectShowMediaType, Q_MOVABLE_TYPE); ^ qtbase/src/corelib/global/qtypeinfo.h:57:7: error: from definition of 'template class tn::QTypeInfo' [-fpermissive] class QTypeInfo ^ Task-number: QTBUG-60118 Change-Id: Idfe7a49b50a0046a5cb17630a3ec99615ec6150a Reviewed-by: Christian Stromme --- src/plugins/common/evr/evrd3dpresentengine.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/plugins/common/evr/evrd3dpresentengine.cpp') diff --git a/src/plugins/common/evr/evrd3dpresentengine.cpp b/src/plugins/common/evr/evrd3dpresentengine.cpp index ae3d69fc2..4bc2bac83 100644 --- a/src/plugins/common/evr/evrd3dpresentengine.cpp +++ b/src/plugins/common/evr/evrd3dpresentengine.cpp @@ -57,6 +57,8 @@ static const int PRESENTER_BUFFER_COUNT = 3; +QT_BEGIN_NAMESPACE + #ifdef MAYBE_ANGLE EGLWrapper::EGLWrapper() @@ -642,3 +644,5 @@ done: } #endif // MAYBE_ANGLE + +QT_END_NAMESPACE -- cgit v1.2.3