summaryrefslogtreecommitdiffstats
path: root/src/opengl/util
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2009-06-04 23:55:22 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-06-04 23:55:22 (GMT)
commitef0d1c839aed75201da10f8db7e515d9fb55bb16 (patch)
tree5f00de5b8913379f9bb28df91782840c7efe6a2d /src/opengl/util
parent58c5df4109acf44982c3a2a7b2318da52606232d (diff)
downloadQt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.zip
Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.tar.gz
Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.tar.bz2
All of Qt's own code compiles with -pedantic now (but pcre and webkit don't seem fixable easily)
Merge-request: 594 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/opengl/util')
-rw-r--r--src/opengl/util/fragmentprograms_p.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/opengl/util/fragmentprograms_p.h b/src/opengl/util/fragmentprograms_p.h
index ecf0bf8..d4b54d4 100644
--- a/src/opengl/util/fragmentprograms_p.h
+++ b/src/opengl/util/fragmentprograms_p.h
@@ -71,7 +71,7 @@ enum FragmentVariable {
VAR_FMP2_M_RADIUS2,
VAR_FMP,
VAR_INV_MATRIX_M0,
- VAR_ANGLE,
+ VAR_ANGLE
};
enum FragmentBrushType {
@@ -80,7 +80,7 @@ enum FragmentBrushType {
FRAGMENT_PROGRAM_BRUSH_CONICAL,
FRAGMENT_PROGRAM_BRUSH_LINEAR,
FRAGMENT_PROGRAM_BRUSH_TEXTURE,
- FRAGMENT_PROGRAM_BRUSH_PATTERN,
+ FRAGMENT_PROGRAM_BRUSH_PATTERN
};
enum FragmentCompositionModeType {
@@ -109,12 +109,12 @@ enum FragmentCompositionModeType {
COMPOSITION_MODES_DIFFERENCE_NOMASK,
COMPOSITION_MODES_EXCLUSION_NOMASK,
COMPOSITION_MODE_BLEND_MODE_MASK,
- COMPOSITION_MODE_BLEND_MODE_NOMASK,
+ COMPOSITION_MODE_BLEND_MODE_NOMASK
};
enum FragmentMaskType {
FRAGMENT_PROGRAM_MASK_TRAPEZOID_AA,
- FRAGMENT_PROGRAM_MASK_ELLIPSE_AA,
+ FRAGMENT_PROGRAM_MASK_ELLIPSE_AA
};
static const unsigned int num_fragment_variables = 19;