diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-02 16:10:04 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-02 16:10:04 (GMT) |
| commit | c7386b14e0c9844db91ca0d2ae6bded6efa008aa (patch) | |
| tree | f39a0e2b8c4d14b9947ffa6d5403fa229bb8fa17 /src/opengl/qgl.cpp | |
| parent | 915f20bb167aa09ca8c8db478a2a78d5e357b67e (diff) | |
| parent | ab473d6a8e4fa619537c4cdaaf1b6a9d8544b30a (diff) | |
| download | Qt-c7386b14e0c9844db91ca0d2ae6bded6efa008aa.zip Qt-c7386b14e0c9844db91ca0d2ae6bded6efa008aa.tar.gz Qt-c7386b14e0c9844db91ca0d2ae6bded6efa008aa.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 621d926..ad177dc 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1773,10 +1773,12 @@ Q_OPENGL_EXPORT QGLShareRegister* qgl_share_reg() /*! \enum QGLContext::BindOption + \since 4.6 + A set of options to decide how to bind a texture using bindTexture(). \value NoBindOption Don't do anything, pass the texture straight - thru. + through. \value InvertedYBindOption Specifies that the texture should be flipped over the X axis so that the texture coordinate 0,0 corresponds to @@ -2158,7 +2160,7 @@ QGLTexture* QGLContextPrivate::bindTexture(const QImage &image, GLenum target, G #ifndef QT_NO_DEBUG // Reset the gl error stack...git - while (glGetError() != GL_NO_ERROR); + while (glGetError() != GL_NO_ERROR) ; #endif // Scale the pixmap if needed. GL textures needs to have the |