From a4ec90175c76ce35688acc06cdf93e9cab886223 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 3 Mar 2014 21:20:30 +0100 Subject: purge vestiges of opengl es 1 support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit amends 0d5170256c1. Change-Id: Ifa178d38f602bb7c66ef13334673ff47e332af5b Reviewed-by: Jørgen Lind Reviewed-by: Laszlo Agocs --- tests/auto/cmake/test_opengl_lib/CMakeLists.txt | 4 +--- tests/auto/cmake/test_opengl_lib/main.cpp | 4 +--- tests/auto/gui/gui.pro | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/cmake/test_opengl_lib/CMakeLists.txt b/tests/auto/cmake/test_opengl_lib/CMakeLists.txt index d602bcda9b..d9adb5a980 100644 --- a/tests/auto/cmake/test_opengl_lib/CMakeLists.txt +++ b/tests/auto/cmake/test_opengl_lib/CMakeLists.txt @@ -10,9 +10,7 @@ add_definitions(${Qt5Gui_DEFINITIONS}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Gui_EXECUTABLE_COMPILE_FLAGS}") -if (${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GLES) - add_definitions(-DGL_IMPLEMENTATION_GLES1) -elseif (${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GLESv2) +if (${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GLESv2) add_definitions(-DGL_IMPLEMENTATION_GLES2) elseif (${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL) add_definitions(-DGL_IMPLEMENTATION_GL) diff --git a/tests/auto/cmake/test_opengl_lib/main.cpp b/tests/auto/cmake/test_opengl_lib/main.cpp index 450b759bc8..1e874ed4fc 100644 --- a/tests/auto/cmake/test_opengl_lib/main.cpp +++ b/tests/auto/cmake/test_opengl_lib/main.cpp @@ -40,9 +40,7 @@ ****************************************************************************/ -#if GL_IMPLEMENTATION_GLES1 -#include -#elif GL_IMPLEMENTATION_GLES2 +#if GL_IMPLEMENTATION_GLES2 #include #elif GL_IMPLEMENTATION_GL diff --git a/tests/auto/gui/gui.pro b/tests/auto/gui/gui.pro index d250e45a4e..78386cc0b1 100644 --- a/tests/auto/gui/gui.pro +++ b/tests/auto/gui/gui.pro @@ -12,4 +12,4 @@ SUBDIRS = \ util \ itemmodels \ -!contains(QT_CONFIG, opengl(es1|es2)?): SUBDIRS -= qopengl +!contains(QT_CONFIG, opengl(es2)?): SUBDIRS -= qopengl -- cgit v1.2.3