From 8226443b16f91aba62125c8f1e1f114cb9c1739b Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Tue, 5 Jul 2011 13:11:09 +1000
Subject: Fixed compile of QtOpenGL on Mac & QPA.

Replace a Q_WS_MAC test (which is not true for Mac & QPA) with Q_OS_MAC
(which is always true on Mac).

Change-Id: Ie3d12bae233d44b3607f4c57a0c65059d0d6ccb9
Reviewed-on: http://codereview.qt.nokia.com/1129
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
---
 src/opengl/qgl.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/opengl/qgl.h')

diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
index 4feaa83c64..4d7b6f1978 100644
--- a/src/opengl/qgl.h
+++ b/src/opengl/qgl.h
@@ -58,9 +58,7 @@ QT_BEGIN_HEADER
 # include <QtCore/qt_windows.h>
 #endif
 
-#if defined(Q_WS_MAC)
-# include <OpenGL/gl.h>
-#elif defined(QT_OPENGL_ES_1)
+#if defined(QT_OPENGL_ES_1)
 # if defined(Q_OS_MAC)
 #  include <OpenGLES/ES1/gl.h>
 # else
@@ -85,7 +83,11 @@ typedef GLfloat GLdouble;
 typedef GLfloat GLdouble;
 # endif
 #else
-# include <GL/gl.h>
+# if defined(Q_OS_MAC)
+#  include <OpenGL/gl.h>
+# else
+#  include <GL/gl.h>
+# endif
 #endif
 
 QT_BEGIN_NAMESPACE
-- 
cgit v1.2.3