summaryrefslogtreecommitdiffstats
path: root/tests/auto/qgl/tst_qgl.cpp
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-24 11:26:40 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-24 11:26:40 (GMT)
commitd55c1c4123c493ba5f607b81caaea0c42255bfd3 (patch)
treea6fe5e62ad8a5b13b542539a920c2ba9808f352d /tests/auto/qgl/tst_qgl.cpp
parent5cb03208083bf86c35ea838a12797d39b99c50e6 (diff)
parent0313b31abdc72f7e8eae56d1d18f22637cdcce8c (diff)
downloadQt-d55c1c4123c493ba5f607b81caaea0c42255bfd3.zip
Qt-d55c1c4123c493ba5f607b81caaea0c42255bfd3.tar.gz
Qt-d55c1c4123c493ba5f607b81caaea0c42255bfd3.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'tests/auto/qgl/tst_qgl.cpp')
-rw-r--r--tests/auto/qgl/tst_qgl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp
index 280c6c8..6ffe2a7 100644
--- a/tests/auto/qgl/tst_qgl.cpp
+++ b/tests/auto/qgl/tst_qgl.cpp
@@ -979,7 +979,7 @@ void tst_QGL::glWidgetWithAlpha()
}
-bool qt_opengl_draw_test_pattern(QPainter* painter, int width, int height)
+void qt_opengl_draw_test_pattern(QPainter* painter, int width, int height)
{
QPainterPath intersectingPath;
intersectingPath.moveTo(0, 0);