Bring OpenGL closer to compiling on Windows.

Change-Id: I8ebb459f27a1054f8cb5524d2ff77988c6153557
Reviewed-on: http://codereview.qt.nokia.com/1421
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>

diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index efc00a9..717e4dd 100644 (file)
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -124,8 +124,10 @@ mac:!qpa {
 }
 win32:!wince*: {
     DEFINES += QT_NO_EGL
-    SOURCES += qgl_win.cpp \
-                  qglpixelbuffer_win.cpp
+    !qpa {
+        SOURCES += qgl_win.cpp \
+                       qglpixelbuffer_win.cpp
+    }
 }
 wince*: {
     SOURCES += qgl_wince.cpp \

diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
index 26c0025..e08e2d2 100644 (file)
--- a/src/opengl/qgl.h
+++ b/src/opengl/qgl.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_HEADER
 
-#if defined(Q_WS_WIN)
+#if defined(Q_OS_WIN)
 # include <QtCore/qt_windows.h>
 #endif
 

diff --git a/src/opengl/qglpixelbuffer_p.h b/src/opengl/qglpixelbuffer_p.h
index eb76104..05d8823 100644 (file)
--- a/src/opengl/qglpixelbuffer_p.h
+++ b/src/opengl/qglpixelbuffer_p.h
@@ -125,7 +125,7 @@ struct GLXFBConfig {
 
 #endif // Q_OS_HPUX
 
-#elif defined(Q_WS_WIN)
+#elif defined(Q_OS_WIN)
 DECLARE_HANDLE(HPBUFFERARB);
 #elif !defined(QT_NO_EGL)
 #include <QtGui/private/qegl_p.h>