diff options
Diffstat (limited to 'src/gui/opengl')
| -rw-r--r-- | src/gui/opengl/opengl.pri | 4 | ||||
| -rw-r--r-- | src/gui/opengl/qopengl.h | 10 |
2 files changed, 0 insertions, 14 deletions
diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri index 56aecd49e2..cadba26797 100644 --- a/src/gui/opengl/opengl.pri +++ b/src/gui/opengl/opengl.pri @@ -122,8 +122,4 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { SOURCES += opengl/qopenglfunctions_es2.cpp } - - contains(QT_CONFIG, dynamicgl) { - win32: SOURCES += opengl/qopenglproxy_win.cpp - } } diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h index 025f8b823c..6eb656cd09 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -107,17 +107,7 @@ typedef GLfloat GLdouble; # include <OpenGL/glext.h> # else # define GL_GLEXT_LEGACY // Prevents GL/gl.h from #including system glext.h - // In dynamic GL builds qopenglproxy will export the GL functions that are - // called also in QtGui itself. To prevent linker warnings (msvc) or errors (mingw) - // we need to make sure the prototypes do not have dllimport. -# ifdef QT_OPENGL_DYNAMIC_IN_GUI -# undef WINGDIAPI -# define WINGDIAPI -# endif // QT_OPENGL_DYNAMIC_IN_GUI # include <GL/gl.h> -# ifdef QT_OPENGL_DYNAMIC_IN_GUI -# undef WINGDIAPI -# endif // QT_OPENGL_DYNAMIC_IN_GUI # include <QtGui/qopenglext.h> # endif // Q_OS_MAC #endif |