diff options
| author | Louai Al-Khanji <louai.al-khanji@digia.com> | 2014-08-15 13:39:14 +0300 |
|---|---|---|
| committer | Louai Al-Khanji <louai.al-khanji@digia.com> | 2014-08-15 14:57:35 +0200 |
| commit | 35e00094cefd43200df96ba09f548486a86bdef4 (patch) | |
| tree | 69d677aff4995fab76cb16e3836ad909f462e24d /src/render/frontend/qscissortest.h | |
| parent | 37b1b13ef5f7f0b8c8ab712d57d681ef5f0c45d5 (diff) | |
Avoid naming classes DrawState
Since winuser.h contains a DrawState #define, this tends to wreck havoc on
Windows. This patch respectively renames QDrawState, Qt3D::Render::DrawState
and Qt3D::Render::DrawStateSet to QRenderState, Qt3D::Render::RenderState and
Qt3D::Render::RenderStateSet. While this is more invasive than just
undefining DrawState, it should be more foolproof too.
Change-Id: I9fa86e5bf1fe41fb4839bd146822cc43e26019e6
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/qscissortest.h')
| -rw-r--r-- | src/render/frontend/qscissortest.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/render/frontend/qscissortest.h b/src/render/frontend/qscissortest.h index 26cdcf01f..6d4849260 100644 --- a/src/render/frontend/qscissortest.h +++ b/src/render/frontend/qscissortest.h @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D module of the Qt Toolkit. @@ -42,7 +43,7 @@ #ifndef QT3D_QSCISSORTEST_H #define QT3D_QSCISSORTEST_H -#include <Qt3DRenderer/qdrawstate.h> +#include <Qt3DRenderer/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -50,7 +51,7 @@ namespace Qt3D { class QScissorTestPrivate; -class QT3DRENDERERSHARED_EXPORT QScissorTest : public QDrawState +class QT3DRENDERERSHARED_EXPORT QScissorTest : public QRenderState { Q_OBJECT Q_PROPERTY(int left READ left WRITE setLeft NOTIFY leftChanged) |