diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 13:36:29 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:10:58 +0100 |
| commit | 3b512ae142017f105f297467f74dc28d3cb9030a (patch) | |
| tree | 9e131e23c01537f051851a1da9576c1e1ddf5ba2 /tests/auto/opengl/qgl | |
| parent | e20c4730192f312881591fb50e571af0a88fe421 (diff) | |
| parent | f956f9a83603a3df5651e3238c24e8df37558d6e (diff) | |
Merge master into api_changes
Change-Id: I93551e4d13a1b0815b359b9415060e9089477db1
Diffstat (limited to 'tests/auto/opengl/qgl')
| -rw-r--r-- | tests/auto/opengl/qgl/qgl.pro | 3 | ||||
| -rw-r--r-- | tests/auto/opengl/qgl/tst_qgl.cpp | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/tests/auto/opengl/qgl/qgl.pro b/tests/auto/opengl/qgl/qgl.pro index 963b2d7e55..db82d9a256 100644 --- a/tests/auto/opengl/qgl/qgl.pro +++ b/tests/auto/opengl/qgl/qgl.pro @@ -7,9 +7,6 @@ TARGET = tst_qgl requires(contains(QT_CONFIG,opengl)) QT += widgets widgets-private opengl-private gui-private core-private testlib -contains(QT_CONFIG,egl):DEFINES += QGL_EGL -win32:!wince*: DEFINES += QT_NO_EGL - SOURCES += tst_qgl.cpp RESOURCES = qgl.qrc diff --git a/tests/auto/opengl/qgl/tst_qgl.cpp b/tests/auto/opengl/qgl/tst_qgl.cpp index f741fb9248..051e26f4af 100644 --- a/tests/auto/opengl/qgl/tst_qgl.cpp +++ b/tests/auto/opengl/qgl/tst_qgl.cpp @@ -1396,10 +1396,6 @@ void tst_QGL::glWidgetRenderPixmap() QImage reference(fb.size(), QImage::Format_RGB32); reference.fill(0xffff0000); -#if defined(QGL_EGL) && !defined(Q_WS_X11) - QSKIP("renderPixmap() not yet supported under EGL on your platform"); -#endif - QFUZZY_COMPARE_IMAGES(fb, reference); } |