diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-22 11:22:35 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-22 11:22:35 (GMT) |
commit | 2b18e27c041f17bbc8989aa0ef5363df34edb8e6 (patch) | |
tree | 484a943b81f79ae74aca22f6370b77dbea8c9050 /src/opengl | |
parent | 4b90559d0a8b693241dd79682d0d31362497468b (diff) | |
parent | 9e88a2f1468b9a4f500b878f514db7f7a1f5eadc (diff) | |
download | Qt-2b18e27c041f17bbc8989aa0ef5363df34edb8e6.zip Qt-2b18e27c041f17bbc8989aa0ef5363df34edb8e6.tar.gz Qt-2b18e27c041f17bbc8989aa0ef5363df34edb8e6.tar.bz2 |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
Doc: Fixing typo
Diffstat (limited to 'src/opengl')
-rw-r--r-- | src/opengl/qgl_qpa.cpp | 2 | ||||
-rw-r--r-- | src/opengl/qwindowsurface_gl.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp index 518c860..b31833a 100644 --- a/src/opengl/qgl_qpa.cpp +++ b/src/opengl/qgl_qpa.cpp @@ -404,7 +404,7 @@ QGLContext *QGLContext::fromPlatformGLContext(QPlatformGLContext *platformContex return reinterpret_cast<QGLContext *>(platformContext->qGLContextHandle()); } QGLContext *glContext = new QGLContext(platformContext); - //Dont call create on context. This can cause the platformFormat to be set on the widget, which + //Don't call create on context. This can cause the platformFormat to be set on the widget, which //will cause the platformWindow to be recreated. return glContext; } diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index d93efb4..7d16b30 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -354,7 +354,7 @@ QGLWindowSurface::~QGLWindowSurface() { if (d_ptr->ctx) glDeleteTextures(1, &d_ptr->tex_id); -#ifndef Q_WS_QPA // Dont delete the contexts. Destroying the window does that for us +#ifndef Q_WS_QPA // Don't delete the contexts. Destroying the window does that for us foreach(QGLContext **ctx, d_ptr->contexts) { delete *ctx; *ctx = 0; |