diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-21 15:37:59 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-26 10:32:06 +0000 |
| commit | f97d5eaaa539e2569f3ca3b8eef6649827b07bc1 (patch) | |
| tree | 7eba6cb287af03a883a3d859188d76408f7d298b /src/plugins/common/evr/evrd3dpresentengine.h | |
| parent | 56185dedd2a075e5b7e72c18e766a60b890c14a1 (diff) | |
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>
Diffstat (limited to 'src/plugins/common/evr/evrd3dpresentengine.h')
| -rw-r--r-- | src/plugins/common/evr/evrd3dpresentengine.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/common/evr/evrd3dpresentengine.h b/src/plugins/common/evr/evrd3dpresentengine.h index d181689ec..18a7409fa 100644 --- a/src/plugins/common/evr/evrd3dpresentengine.h +++ b/src/plugins/common/evr/evrd3dpresentengine.h @@ -50,10 +50,6 @@ # define MAYBE_ANGLE #endif -QT_BEGIN_NAMESPACE -class QAbstractVideoSurface; -QT_END_NAMESPACE - struct IDirect3D9Ex; struct IDirect3DDevice9Ex; struct IDirect3DDeviceManager9; @@ -66,7 +62,9 @@ struct IMFMediaType; static const GUID MFSamplePresenter_SampleCounter = { 0xb0bb83cc, 0xf10f, 0x4e2e, { 0xaa, 0x2b, 0x29, 0xea, 0x5e, 0x92, 0xef, 0x85 } }; -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE + +class QAbstractVideoSurface; #ifdef MAYBE_ANGLE @@ -153,4 +151,6 @@ private: friend class IMFSampleVideoBuffer; }; +QT_END_NAMESPACE + #endif // EVRD3DPRESENTENGINE_H |