diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-07-11 14:05:09 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-07-11 14:35:37 +0200 |
| commit | 54ec6d177e0e8fb04cd01e70461484a80ca1f7a4 (patch) | |
| tree | c338e1cfaf5f25314d2ae9fdf7a6859880e95ace /src/opengl | |
| parent | 3ee33285edb7b1f5e23a5e0ff49fa0a3d236793e (diff) | |
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>
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/opengl.pro | 6 | ||||
| -rw-r--r-- | src/opengl/qgl.h | 2 | ||||
| -rw-r--r-- | src/opengl/qglpixelbuffer_p.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index efc00a9b66..717e4ddc90 100644 --- 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 26c0025342..e08e2d234f 100644 --- 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 eb761047e7..05d8823909 100644 --- 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> |