diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-29 10:17:53 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-29 11:33:35 +0100 |
commit | 3eb588078e7f4d62053584a70f7600b19ec99a0f (patch) | |
tree | 432c6bfcabf44b8fdbc4a8e1ab58054e548a77bf /tests/auto/opengl/qgl/tst_qgl.cpp | |
parent | 7b8ab4204417844e72bb66696227a422f4ef3e2d (diff) | |
parent | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/opengl/qgl/tst_qgl.cpp')
-rw-r--r-- | tests/auto/opengl/qgl/tst_qgl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/opengl/qgl/tst_qgl.cpp b/tests/auto/opengl/qgl/tst_qgl.cpp index 0e6dba2132..6c5c90d737 100644 --- a/tests/auto/opengl/qgl/tst_qgl.cpp +++ b/tests/auto/opengl/qgl/tst_qgl.cpp @@ -1597,8 +1597,8 @@ void tst_QGL::fboFormat() void tst_QGL::testDontCrashOnDanglingResources() { - // We have a number of Q_GLOBAL_STATICS inside the QtOpenGL - // library. This test is verify that we don't crash as a result of + // We have a number of Q_GLOBAL_STATICS inside the Qt OpenGL + // module. This test is verify that we don't crash as a result of // them calling into libgl on application shutdown. QWidget *widget = new UnclippedWidget(); widget->show(); |