whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Friedemann Kleint 2011-07-11 14:05:09 +02:00
parent 3ee33285ed
commit 54ec6d177e
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/opengl/opengl.pro
View File

@ -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 \

2
src/opengl/qgl.h
View File

@ -52,7 +52,7 @@
QT_BEGIN_HEADER
#if defined(Q_WS_WIN)
#if defined(Q_OS_WIN)
# include <QtCore/qt_windows.h>
#endif

2
src/opengl/qglpixelbuffer_p.h
View File

@ -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>