diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-08-31 10:55:24 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-08-31 10:57:09 (GMT) |
| commit | 076b5d3bc4a5b29886e946942ecd6eab1dde3d51 (patch) | |
| tree | 2d62c74cc29875b2ab1a05a482c9aac50d81faf6 /src | |
| parent | 0c4a6ba2573713aea1867599b1d872aa7c523daf (diff) | |
| download | Qt-076b5d3bc4a5b29886e946942ecd6eab1dde3d51.zip Qt-076b5d3bc4a5b29886e946942ecd6eab1dde3d51.tar.gz Qt-076b5d3bc4a5b29886e946942ecd6eab1dde3d51.tar.bz2 | |
Fixed compile failure caused by merge error in fragmentprograms_p.h.
Diffstat (limited to 'src')
| -rw-r--r-- | src/opengl/util/fragmentprograms_p.h | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/src/opengl/util/fragmentprograms_p.h b/src/opengl/util/fragmentprograms_p.h index 07640c3..b02c600 100644 --- a/src/opengl/util/fragmentprograms_p.h +++ b/src/opengl/util/fragmentprograms_p.h @@ -1,7 +1,30 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtOpenGL module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions ** contained in the Technology Preview License Agreement accompanying ** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, 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. +** ** If you have questions regarding the use of this file, please contact ** Nokia at qt-info@nokia.com. ** @@ -11,9 +34,24 @@ ** ** ** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ #ifndef FRAGMENTPROGRAMS_H #define FRAGMENTPROGRAMS_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + enum FragmentVariable { VAR_BRUSH_TEXTURE, VAR_LINEAR, |