diff options
| author | David Faure <faure@kde.org> | 2009-06-05 09:55:22 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-06-05 09:55:22 +1000 |
| commit | ef0d1c839aed75201da10f8db7e515d9fb55bb16 (patch) | |
| tree | 5f00de5b8913379f9bb28df91782840c7efe6a2d /src/opengl/qglshaderprogram.h | |
| parent | 58c5df4109acf44982c3a2a7b2318da52606232d (diff) | |
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/qglshaderprogram.h')
| -rw-r--r-- | src/opengl/qglshaderprogram.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h index ab30c32eae..06bff42576 100644 --- a/src/opengl/qglshaderprogram.h +++ b/src/opengl/qglshaderprogram.h @@ -103,7 +103,7 @@ private: friend class QGLShaderProgram; - Q_DISABLE_COPY(QGLShader); + Q_DISABLE_COPY(QGLShader) }; class QGLShaderProgramPrivate; @@ -279,7 +279,7 @@ public: private: QGLShaderProgramPrivate *d; - Q_DISABLE_COPY(QGLShaderProgram); + Q_DISABLE_COPY(QGLShaderProgram) bool init(); }; |