From d8c81e5db3e5aefd87f3f4e552eb791d84ad3d3d Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Mon, 19 Jun 2017 13:31:05 +0300 Subject: Enable tests for boot2qt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The tests for boot2qt were disabled with commit 0340120d5f7940c9aebfd0f60328805227f8824d. Some of them can now be enabled since qtdeclarative fallbacks to software renderer if OpenGL is not supported. Some tests still need to be skipped if OpenGL is not supported. Task-number: QTBUG-60268 Change-Id: I8019859bc88497e08599d0b5f4981b9a3ac071f3 Reviewed-by: Tomi Korpipää --- tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp') diff --git a/tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp b/tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp index 9bea4ae0..eb984c1a 100644 --- a/tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp +++ b/tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp @@ -33,6 +33,8 @@ #include #include +#include "cpptestutil.h" + using namespace QtDataVisualization; class tst_proxy: public QObject @@ -234,6 +236,9 @@ void tst_proxy::initializeProperties() void tst_proxy::multiMatch() { + if (!CpptestUtil::isOpenGLSupported()) + QSKIP("OpenGL not supported on this platform"); + Q3DSurface graph; QTableWidget table; -- cgit v1.2.3