diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-28 11:22:42 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-28 11:05:47 +0000 |
| commit | 717f56999939bb9c1aeb88c959afdafb4ada02cc (patch) | |
| tree | 67e8f90362bf5d1e438e4c6a5a09220022a5bc6a /src/core/stream_video_node.h | |
| parent | 4641d0d1c903208fd769251f2aa2f829f0eecd38 (diff) | |
Add namespace to the specialized QSG nodes
Add QtWebEngineCore namespace to classes I missed earlier.
Change-Id: Ia40b03c58e0aec858e8fbe9a8fdb532349353046
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/stream_video_node.h')
| -rw-r--r-- | src/core/stream_video_node.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/core/stream_video_node.h b/src/core/stream_video_node.h index f808bb609..bd2c3408a 100644 --- a/src/core/stream_video_node.h +++ b/src/core/stream_video_node.h @@ -40,9 +40,9 @@ #include <QtQuick/qsgmaterial.h> #include <QtQuick/qsgnode.h> -QT_BEGIN_NAMESPACE -class QSGTexture; -QT_END_NAMESPACE +QT_FORWARD_DECLARE_CLASS(QSGTexture) + +namespace QtWebEngineCore { // These classes duplicate, QtQuick style, the logic of GLRenderer::DrawStreamVideoQuad. // Their behavior should stay as close as possible to GLRenderer. @@ -52,7 +52,8 @@ class StreamVideoMaterial : public QSGMaterial public: StreamVideoMaterial(QSGTexture *texture); - virtual QSGMaterialType *type() const Q_DECL_OVERRIDE{ + virtual QSGMaterialType *type() const Q_DECL_OVERRIDE + { static QSGMaterialType theType; return &theType; } @@ -75,4 +76,6 @@ private: StreamVideoMaterial *m_material; }; +} // namespace + #endif // STREAM_VIDEO_NODE_H |