diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:31:28 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-23 14:31:28 +0100 |
commit | 425b38ef95f6f4478ffbd4ada0d3046fae2c95e7 (patch) | |
tree | 0347dd701ace8ab022cf6c86edbb61be9795a668 /tests/auto/opengl | |
parent | 2f2b78321427daa8c7f0702140c297d22b0bf3c8 (diff) | |
parent | 3b512ae142017f105f297467f74dc28d3cb9030a (diff) |
Merge "Merge master into api_changes" into refs/staging/api_changes
Diffstat (limited to 'tests/auto/opengl')
-rw-r--r-- | tests/auto/opengl/qgl/qgl.pro | 3 | ||||
-rw-r--r-- | tests/auto/opengl/qgl/tst_qgl.cpp | 4 | ||||
-rw-r--r-- | tests/auto/opengl/qglbuffer/qglbuffer.pro | 2 | ||||
-rw-r--r-- | tests/auto/opengl/qglfunctions/qglfunctions.pro | 2 | ||||
-rw-r--r-- | tests/auto/opengl/qglthreads/qglthreads.pro | 2 |
5 files changed, 0 insertions, 13 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); } diff --git a/tests/auto/opengl/qglbuffer/qglbuffer.pro b/tests/auto/opengl/qglbuffer/qglbuffer.pro index 537f3c122a..f766cb8944 100644 --- a/tests/auto/opengl/qglbuffer/qglbuffer.pro +++ b/tests/auto/opengl/qglbuffer/qglbuffer.pro @@ -7,6 +7,4 @@ TARGET = tst_qglbuffer requires(contains(QT_CONFIG,opengl)) QT += opengl widgets testlib -win32:!wince*: DEFINES += QT_NO_EGL - SOURCES += tst_qglbuffer.cpp diff --git a/tests/auto/opengl/qglfunctions/qglfunctions.pro b/tests/auto/opengl/qglfunctions/qglfunctions.pro index 4b7c8758a9..0113068f1d 100644 --- a/tests/auto/opengl/qglfunctions/qglfunctions.pro +++ b/tests/auto/opengl/qglfunctions/qglfunctions.pro @@ -3,6 +3,4 @@ TARGET = tst_qglfunctions requires(contains(QT_CONFIG,opengl)) QT += opengl widgets testlib -win32:!wince*: DEFINES += QT_NO_EGL - SOURCES += tst_qglfunctions.cpp diff --git a/tests/auto/opengl/qglthreads/qglthreads.pro b/tests/auto/opengl/qglthreads/qglthreads.pro index 9d3e86a03e..1534472ef6 100644 --- a/tests/auto/opengl/qglthreads/qglthreads.pro +++ b/tests/auto/opengl/qglthreads/qglthreads.pro @@ -3,8 +3,6 @@ TARGET = tst_qglthreads requires(contains(QT_CONFIG,opengl)) QT += opengl widgets testlib -win32:!wince*: DEFINES += QT_NO_EGL - HEADERS += tst_qglthreads.h SOURCES += tst_qglthreads.cpp |