1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: get rid of indirect #defines in gl tests

Browse Source 
in the gles tests, use #ifdef __APPLE__ directly instead of defining
BUILD_ON_MAC. this is consistent with the desktop gl test, less magic,
and corresponds with the later usage (which does #ifdef Q_OS_MAC).
amends f3d82a89.

in the desktop gl test, clean out the dead Q_OS_MAC define from the
project file (added in 45dc5852 concurrently to the more direct fix in
864815ef).

Change-Id: Ieebad3c7e87218b887f61485c331b93eadfcf406
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Oswald Buddenhagen 2017-07-28 22:52:05 +02:00 committed by Simon Hausmann
parent 6f735b6839
commit 479b2ab55f
5 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.tests/unix/opengldesktop/opengldesktop.pro
View File

@ -1,5 +1,3 @@
SOURCES = opengldesktop.cpp
CONFIG -= qt
mac:DEFINES += Q_OS_MAC

2
config.tests/unix/opengles2/opengles2.cpp
View File

@ -37,7 +37,7 @@
**
****************************************************************************/
#ifdef BUILD_ON_MAC
#ifdef __APPLE__
#include <OpenGLES/ES2/gl.h>
#else
#define GL_GLEXT_PROTOTYPES

4
config.tests/unix/opengles2/opengles2.pro
View File

@ -1,7 +1,3 @@
SOURCES = opengles2.cpp
CONFIG -= qt
mac {
DEFINES += BUILD_ON_MAC
}

2
config.tests/unix/opengles3/opengles3.cpp
View File

@ -37,7 +37,7 @@
**
****************************************************************************/
#ifdef BUILD_ON_MAC
#ifdef __APPLE__
#include <OpenGLES/ES3/gl.h>
#else
#define GL_GLEXT_PROTOTYPES

4
config.tests/unix/opengles3/opengles3.pro
View File

@ -5,7 +5,3 @@
SOURCES = opengles3.cpp
CONFIG -= qt
mac {
DEFINES += BUILD_ON_MAC
}