From 45dc5852d54bee40281095587653f0b2bd6d7e40 Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Tue, 5 Jul 2011 11:02:44 +1000
Subject: Fixed opengldesktop configure test for mac.

This configure test has never worked for mac.

In a non-qpa configuration, this didn't matter, as the configure script
would skip this configure test on mac.  The configure script could also
be modified to skip the configure test in the qpa case, but it seems
cleaner to make the test actually work.

Change-Id: I0402c490fc4c2401f6363ba2215b261f74ee5d75
Reviewed-on: http://codereview.qt.nokia.com/1127
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
---
 config.tests/unix/opengldesktop/opengldesktop.cpp | 6 +++++-
 config.tests/unix/opengldesktop/opengldesktop.pro | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'config.tests/unix')

diff --git a/config.tests/unix/opengldesktop/opengldesktop.cpp b/config.tests/unix/opengldesktop/opengldesktop.cpp
index 54860fe90b..af21cfdfda 100644
--- a/config.tests/unix/opengldesktop/opengldesktop.cpp
+++ b/config.tests/unix/opengldesktop/opengldesktop.cpp
@@ -39,7 +39,11 @@
 **
 ****************************************************************************/
 
-#include <GL/gl.h>
+#if defined(Q_OS_MAC)
+# include <OpenGL/gl.h>
+#else
+# include <GL/gl.h>
+#endif
 
 int main(int, char **)
 {
diff --git a/config.tests/unix/opengldesktop/opengldesktop.pro b/config.tests/unix/opengldesktop/opengldesktop.pro
index ac70ca34ef..fbf36a0c67 100644
--- a/config.tests/unix/opengldesktop/opengldesktop.pro
+++ b/config.tests/unix/opengldesktop/opengldesktop.pro
@@ -7,3 +7,6 @@ for(p, QMAKE_LIBDIR_OPENGL) {
 
 CONFIG -= qt
 LIBS += $$QMAKE_LIBS_OPENGL
+
+mac:DEFINES += Q_OS_MAC
+CONFIG -= app_bundle
-- 
cgit v1.2.3