diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-15 08:57:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-15 09:10:12 +0200 |
| commit | 9f3aefb086c5f9d6b9dd192689bdd473da07186a (patch) | |
| tree | 93349812f4a46305edf5e27f7e737d952e0d9a3a /examples/quick/scenegraph | |
| parent | a021bd87755ccfbe49e132f942ded935c9719b00 (diff) | |
| parent | d2bb2e202427ebae545a408f065c893f3d837061 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/qml/compiler/qv4codegen.cpp
Change-Id: I3c41b9fc9ba7d41741e4dd400402ae80dd7726d9
Diffstat (limited to 'examples/quick/scenegraph')
| -rw-r--r-- | examples/quick/scenegraph/rendernode/d3d12renderer.h | 4 | ||||
| -rw-r--r-- | examples/quick/scenegraph/rendernode/openglrenderer.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/quick/scenegraph/rendernode/d3d12renderer.h b/examples/quick/scenegraph/rendernode/d3d12renderer.h index 1d2726819f..b071f45191 100644 --- a/examples/quick/scenegraph/rendernode/d3d12renderer.h +++ b/examples/quick/scenegraph/rendernode/d3d12renderer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. @@ -45,7 +45,7 @@ #if QT_CONFIG(d3d12) -class QQuickItem; +QT_FORWARD_DECLARE_CLASS(QQuickItem) #include <d3d12.h> #include <wrl/client.h> diff --git a/examples/quick/scenegraph/rendernode/openglrenderer.h b/examples/quick/scenegraph/rendernode/openglrenderer.h index ea2bbcbc38..213e77fade 100644 --- a/examples/quick/scenegraph/rendernode/openglrenderer.h +++ b/examples/quick/scenegraph/rendernode/openglrenderer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. @@ -51,6 +51,8 @@ class QQuickItem; class QOpenGLShaderProgram; class QOpenGLBuffer; +QT_END_NAMESPACE + class OpenGLRenderNode : public QSGRenderNode { public: @@ -73,8 +75,6 @@ private: QOpenGLBuffer *m_vbo = nullptr; }; -QT_END_NAMESPACE - #endif // opengl #endif |