summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex
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/gl2paintengineex
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/gl2paintengineex')
-rw-r--r--src/opengl/gl2paintengineex/qglengineshadermanager_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
index 9bc81ef..afbc918 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
@@ -257,7 +257,7 @@ static const GLuint QT_TEXTURE_COORDS_ATTR = 1;
class QGLEngineShaderManager : public QObject
{
- Q_OBJECT;
+ Q_OBJECT
public:
QGLEngineShaderManager(QGLContext* context);
~QGLEngineShaderManager();
@@ -352,7 +352,7 @@ public:
*/
#if defined (QT_DEBUG)
- Q_ENUMS(ShaderName);
+ Q_ENUMS(ShaderName)
#endif