From 479b2ab55f45f392ee3a9ad36dca25279bac1a8c Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Fri, 28 Jul 2017 22:52:05 +0200
Subject: configure: get rid of indirect #defines in gl tests

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>
---
 config.tests/unix/opengldesktop/opengldesktop.pro | 2 --
 config.tests/unix/opengles2/opengles2.cpp         | 2 +-
 config.tests/unix/opengles2/opengles2.pro         | 4 ----
 config.tests/unix/opengles3/opengles3.cpp         | 2 +-
 config.tests/unix/opengles3/opengles3.pro         | 4 ----
 5 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/config.tests/unix/opengldesktop/opengldesktop.pro b/config.tests/unix/opengldesktop/opengldesktop.pro
index 22c0be247d..7b53aa460d 100644
--- a/config.tests/unix/opengldesktop/opengldesktop.pro
+++ b/config.tests/unix/opengldesktop/opengldesktop.pro
@@ -1,5 +1,3 @@
 SOURCES = opengldesktop.cpp
 
 CONFIG -= qt
-
-mac:DEFINES += Q_OS_MAC
diff --git a/config.tests/unix/opengles2/opengles2.cpp b/config.tests/unix/opengles2/opengles2.cpp
index a9ad0d6766..39a48dcf29 100644
--- a/config.tests/unix/opengles2/opengles2.cpp
+++ b/config.tests/unix/opengles2/opengles2.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#ifdef BUILD_ON_MAC
+#ifdef __APPLE__
   #include <OpenGLES/ES2/gl.h>
 #else
   #define GL_GLEXT_PROTOTYPES
diff --git a/config.tests/unix/opengles2/opengles2.pro b/config.tests/unix/opengles2/opengles2.pro
index c84563f62e..15e4ce3ca0 100644
--- a/config.tests/unix/opengles2/opengles2.pro
+++ b/config.tests/unix/opengles2/opengles2.pro
@@ -1,7 +1,3 @@
 SOURCES = opengles2.cpp
 
 CONFIG -= qt
-
-mac {
-    DEFINES += BUILD_ON_MAC
-}
diff --git a/config.tests/unix/opengles3/opengles3.cpp b/config.tests/unix/opengles3/opengles3.cpp
index b5bf9b4a80..7bcfc0e4bc 100644
--- a/config.tests/unix/opengles3/opengles3.cpp
+++ b/config.tests/unix/opengles3/opengles3.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#ifdef BUILD_ON_MAC
+#ifdef __APPLE__
   #include <OpenGLES/ES3/gl.h>
 #else
   #define GL_GLEXT_PROTOTYPES
diff --git a/config.tests/unix/opengles3/opengles3.pro b/config.tests/unix/opengles3/opengles3.pro
index 956a3bc102..dc62f7856a 100644
--- a/config.tests/unix/opengles3/opengles3.pro
+++ b/config.tests/unix/opengles3/opengles3.pro
@@ -5,7 +5,3 @@
 SOURCES = opengles3.cpp
 
 CONFIG -= qt
-
-mac {
-    DEFINES += BUILD_ON_MAC
-}
-- 
cgit v1.2.3