1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up proxy leftovers in gui/opengl

Browse Source 
Change-Id: I24d10dab121c23b0683fa99bd309cf557c3ddffb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
This commit is contained in:
Laszlo Agocs 2014-03-03 17:56:33 +01:00 committed by The Qt Project
parent 19501b0731
commit 1f802afc49
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/gui.pro
View File

@ -18,8 +18,6 @@ win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
\$\$QT_MODULE_INCLUDE_BASE/QtANGLE \$\$QT_MODULE_INCLUDE_BASE/QtANGLE
} }
contains(QT_CONFIG, dynamicgl): DEFINES += QT_OPENGL_DYNAMIC_IN_GUI
load(qt_module) load(qt_module)
# Code coverage with TestCocoon # Code coverage with TestCocoon

4
src/gui/opengl/opengl.pri
View File

@ -122,8 +122,4 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) {
SOURCES += opengl/qopenglfunctions_es2.cpp SOURCES += opengl/qopenglfunctions_es2.cpp
} }
contains(QT_CONFIG, dynamicgl) {
win32: SOURCES += opengl/qopenglproxy_win.cpp
}
} }

10
src/gui/opengl/qopengl.h
View File

@ -107,17 +107,7 @@ typedef GLfloat GLdouble;
# include <OpenGL/glext.h> # include <OpenGL/glext.h>
# else # else
# define GL_GLEXT_LEGACY // Prevents GL/gl.h from #including system glext.h # 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> # include <GL/gl.h>
# ifdef QT_OPENGL_DYNAMIC_IN_GUI
# undef WINGDIAPI
# endif // QT_OPENGL_DYNAMIC_IN_GUI
# include <QtGui/qopenglext.h> # include <QtGui/qopenglext.h>
# endif // Q_OS_MAC # endif // Q_OS_MAC
#endif #endif