diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-24 11:26:40 (GMT) |
---|---|---|
committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-24 11:26:40 (GMT) |
commit | d55c1c4123c493ba5f607b81caaea0c42255bfd3 (patch) | |
tree | a6fe5e62ad8a5b13b542539a920c2ba9808f352d /tests/auto/qgl/tst_qgl.cpp | |
parent | 5cb03208083bf86c35ea838a12797d39b99c50e6 (diff) | |
parent | 0313b31abdc72f7e8eae56d1d18f22637cdcce8c (diff) | |
download | Qt-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.cpp | 2 |
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); |