From 18c46875effbfa051af1f67bcb6c575db11b994b Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 8 Jun 2017 11:34:15 +0200 Subject: Fix building examples with namespaced Qt Change-Id: I065715a523028a91ee3a841140734ad6eba240c2 Reviewed-by: Simon Hausmann --- examples/quick/scenegraph/rendernode/d3d12renderer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/quick/scenegraph') 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 #include -- cgit v1.2.3 From 6b9c7c617a306339929aea808413755c65ea393c Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 8 Jun 2017 12:07:22 +0200 Subject: Fix use of Qt namespaces in examples The Qt namespace should only be used for Qt types, not user (or example) types. Change-Id: I9361bcd8ad70fe6b8d3b2fe20494466901ceeaa8 Reviewed-by: Simon Hausmann Reviewed-by: Erik Verbruggen --- examples/quick/scenegraph/rendernode/openglrenderer.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/quick/scenegraph') 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 -- cgit v1.2.3