diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-28 13:01:55 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-28 13:01:55 (GMT) |
| commit | 7a69207653d97037d76b3dedfa3fa67033962eb3 (patch) | |
| tree | 0be4650fc332d9c5197dac3877567cb23504db77 /src/opengl/qgl.h | |
| parent | 9725ab222ffceb34b93af01631b273404ab784a9 (diff) | |
| parent | 406f13e53ad78ba65b15ee7f06787e1d8a5d3fdd (diff) | |
| download | Qt-7a69207653d97037d76b3dedfa3fa67033962eb3.zip Qt-7a69207653d97037d76b3dedfa3fa67033962eb3.tar.gz Qt-7a69207653d97037d76b3dedfa3fa67033962eb3.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/opengl/qgl.h')
| -rw-r--r-- | src/opengl/qgl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index a928d64..13ad668 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -300,7 +300,7 @@ public: DefaultBindOption = LinearFilteringBindOption | InvertedYBindOption | MipmapBindOption, InternalBindOption = MemoryManagedBindOption | PremultipliedAlphaBindOption }; - Q_DECLARE_FLAGS(BindOptions, BindOption); + Q_DECLARE_FLAGS(BindOptions, BindOption) GLuint bindTexture(const QImage &image, GLenum target, GLint format, BindOptions options); |