From 46ef32d424d7e0209e52528286e31f656c654289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 5 Nov 2014 11:50:08 +0200 Subject: Added flags to software renderer test Change-Id: I0667a0e53fd07fe9c6ce7b2d63887eda1692bf3b Change-Id: I0667a0e53fd07fe9c6ce7b2d63887eda1692bf3b Reviewed-by: Miikka Heikkinen --- src/datavisualization/utils/qutils.h | 2 ++ src/datavisualization/utils/utils.cpp | 2 ++ 2 files changed, 4 insertions(+) (limited to 'src/datavisualization/utils') diff --git a/src/datavisualization/utils/qutils.h b/src/datavisualization/utils/qutils.h index 86a0af5e..93226be9 100644 --- a/src/datavisualization/utils/qutils.h +++ b/src/datavisualization/utils/qutils.h @@ -64,11 +64,13 @@ inline static QSurfaceFormat qDefaultSurfaceFormat(bool antialias = true) delete dummySurface; } +#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)) // We support only ES2 emulation with software renderer for now if (QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL)) { qWarning("Only OpenGL ES2 emulation is available for software rendering."); isES = true; } +#endif if (isES) { // For ES2 only attributes diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp index edec8236..7f10bac7 100644 --- a/src/datavisualization/utils/utils.cpp +++ b/src/datavisualization/utils/utils.cpp @@ -355,11 +355,13 @@ void Utils::resolveStatics() delete dummySurface; } +#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)) // We support only ES2 emulation with software renderer for now if (QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL)) { qWarning("Only OpenGL ES2 emulation is available for software rendering."); isES = true; } +#endif staticsResolved = true; } -- cgit v1.2.3