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/evrhelpers.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/evrhelpers.h')
| -rw-r--r-- | src/plugins/common/evr/evrhelpers.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/common/evr/evrhelpers.h b/src/plugins/common/evr/evrhelpers.h index 54ab8b848..d2fdfdcae 100644 --- a/src/plugins/common/evr/evrhelpers.h +++ b/src/plugins/common/evr/evrhelpers.h @@ -43,7 +43,7 @@ #include "evrdefs.h" #include <qvideoframe.h> -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE template<class T> static inline void qt_evr_safe_release(T **unk) @@ -93,5 +93,7 @@ inline HRESULT qt_evr_getFrameRate(IMFMediaType *pType, MFRatio *pRatio) QVideoFrame::PixelFormat qt_evr_pixelFormatFromD3DFormat(D3DFORMAT format); D3DFORMAT qt_evr_D3DFormatFromPixelFormat(QVideoFrame::PixelFormat format); +QT_END_NAMESPACE + #endif // EVRHELPERS_H |