diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 10:02:02 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 10:02:32 +0100 |
| commit | 3c5cef4fdec28ab4adfb24f75f2fd7f3fca7b3b0 (patch) | |
| tree | 7dfd894311ad904b50c35470f24479c5f5fa43ec /src/imports/shaders/shadereffectbuffer.h | |
| parent | b35d793648a24b229aac75ea43d5a175967304ca (diff) | |
| parent | 14166395053bf93a561d87846d172515e5325882 (diff) | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: Ic10a8c118053323004cafe1b4bffd990a16aaf7f
Diffstat (limited to 'src/imports/shaders/shadereffectbuffer.h')
| -rw-r--r-- | src/imports/shaders/shadereffectbuffer.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/imports/shaders/shadereffectbuffer.h b/src/imports/shaders/shadereffectbuffer.h index 8674ff7b..569d1ab2 100644 --- a/src/imports/shaders/shadereffectbuffer.h +++ b/src/imports/shaders/shadereffectbuffer.h @@ -44,8 +44,6 @@ #include <QGLFramebufferObject> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class ShaderEffectBuffer : public QGLFramebufferObject @@ -55,8 +53,6 @@ public: ~ShaderEffectBuffer(); }; -QT_END_HEADER - QT_END_NAMESPACE #endif // SHADEREFFECTBUFFER_H |