diff options
Diffstat (limited to 'src')
| -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> |