From b936b959650128bb8befaaa069477629105c680d Mon Sep 17 00:00:00 2001 From: Donald Carr Date: Wed, 7 Mar 2012 14:07:07 +0000 Subject: EGLFS: Integrate building into configure. With the move to the QPA architecture EGL is now only required by individual platform plugins and the configure script has been adjusted to reflect this. Change-Id: Ieadacef0b970f29752d9e3e36a007e5cbb005b0d Reviewed-by: Oswald Buddenhagen Reviewed-by: Girish Ramakrishnan --- tests/auto/opengl/qgl/qgl.pro | 3 --- tests/auto/opengl/qgl/tst_qgl.cpp | 4 ---- tests/auto/opengl/qglbuffer/qglbuffer.pro | 2 -- tests/auto/opengl/qglfunctions/qglfunctions.pro | 2 -- tests/auto/opengl/qglthreads/qglthreads.pro | 2 -- 5 files changed, 13 deletions(-) (limited to 'tests/auto/opengl') 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 -- cgit v1.2.3