summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Barron <jason.barron@nokia.com>2011-09-14 16:35:22 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-15 09:11:35 +0200
commit5043501e64f5a7427fa2cd91989ce2c4e5c0c679 (patch)
tree44d81ac0b6c225a4db837f467400b1f48a4d7a3f
parentebb929d49318deae9d6bfdf97294315690640f91 (diff)
Get the Windows GL context to compile.
Not sure why this was not the case all along, but on my MSVC2008 installation the include must be prefixed by the 'GL' directory. Change-Id: Icb29b072446bab386b5c62ab0df453ded41b8ede Reviewed-on: http://codereview.qt-project.org/4914 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
-rw-r--r--src/plugins/platforms/windows/qwindowsglcontext.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp
index c144a621e6..31d8c02cb8 100644
--- a/src/plugins/platforms/windows/qwindowsglcontext.cpp
+++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp
@@ -47,11 +47,7 @@
#include <QtCore/QSysInfo>
#include <WinGDI.h>
-#if defined(Q_CC_MINGW)
-# include <GL/Gl.h>
-#else
-# include <Gl.h>
-#endif
+#include <GL/Gl.h>
// #define DEBUG_GL