From f97d5eaaa539e2569f3ca3b8eef6649827b07bc1 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
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 T> class tn::QTypeInfo' in different namespace [-fpermissive]
 class QTypeInfo<TYPE > \
       ^
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 T> class tn::QTypeInfo' [-fpermissive]
 class QTypeInfo
       ^

Task-number: QTBUG-60118
Change-Id: Idfe7a49b50a0046a5cb17630a3ec99615ec6150a
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
---
 src/plugins/directshow/player/directshowioreader.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/plugins/directshow/player/directshowioreader.cpp')

diff --git a/src/plugins/directshow/player/directshowioreader.cpp b/src/plugins/directshow/player/directshowioreader.cpp
index a35124b1e..7f3303633 100644
--- a/src/plugins/directshow/player/directshowioreader.cpp
+++ b/src/plugins/directshow/player/directshowioreader.cpp
@@ -48,6 +48,8 @@
 #include <QtCore/qiodevice.h>
 #include <QtCore/qthread.h>
 
+QT_BEGIN_NAMESPACE
+
 class DirectShowSampleRequest
 {
 public:
@@ -492,3 +494,5 @@ void DirectShowIOReader::flushRequests()
             m_readyHead = m_readyTail;
     }
 }
+
+QT_END_NAMESPACE
-- 
cgit v1.2.3