diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:07:32 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:10:29 +0100 |
commit | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (patch) | |
tree | 156ccba392968d3d2ba3bcb5bb098a1ff0b7e8ce /tests/auto/opengl/qgl/tst_qgl.cpp | |
parent | bf5f2a9e3e3bf70c373b65bf95a332f4e1c514f9 (diff) | |
parent | 0b68fc019bbeedb8b6b59bbbdf31f66596b6d5ac (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I12b4d8b99bdccae53b1a978cd6eb8f4ac6fb3c76
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(); |