diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-11 09:26:05 +0200 |
---|---|---|
committer | Kim M. Kalland <kim.kalland@nokia.com> | 2011-09-12 13:00:44 +0200 |
commit | 884e0194eecb5d0c13218818972542f87ca46393 (patch) | |
tree | 664b5f428e339162104ea35af87ab1c4b2ac9b27 /src/declarative/scenegraph/util/qsgvertexcolormaterial_p.h | |
parent | 4f73ff97486f89b8e7aca1ed7d55cf42a644d68b (diff) |
Implement QSGVertexColorMaterial::compare and make the class public
Since the opaque state is just as easily settable through the
Blending flag, we ditch it
Change-Id: I92598e3305bd056fdf0711f1fbd6c1be8bf88275
Reviewed-on: http://codereview.qt-project.org/4628
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Diffstat (limited to 'src/declarative/scenegraph/util/qsgvertexcolormaterial_p.h')
-rw-r--r-- | src/declarative/scenegraph/util/qsgvertexcolormaterial_p.h | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/src/declarative/scenegraph/util/qsgvertexcolormaterial_p.h b/src/declarative/scenegraph/util/qsgvertexcolormaterial_p.h deleted file mode 100644 index 8392ef2155..0000000000 --- a/src/declarative/scenegraph/util/qsgvertexcolormaterial_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef VERTEXCOLORMATERIAL_H -#define VERTEXCOLORMATERIAL_H - -#include <qsgmaterial.h> - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Declarative) - -class QSGVertexColorMaterial : public QSGMaterial -{ -public: - QSGVertexColorMaterial(); - - void setColorsAreOpaque(bool opaqueHint); - -protected: - virtual QSGMaterialType *type() const; - virtual QSGMaterialShader *createShader() const; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // VERTEXCOLORMATERIAL_H |