From 1f802afc49e10647e89e00da68feff73ea66a90f Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@digia.com>
Date: Mon, 3 Mar 2014 17:56:33 +0100
Subject: [PATCH] Clean up proxy leftovers in gui/opengl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I24d10dab121c23b0683fa99bd309cf557c3ddffb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
---
 src/gui/gui.pro           |  2 --
 src/gui/opengl/opengl.pri |  4 ----
 src/gui/opengl/qopengl.h  | 10 ----------
 3 files changed, 16 deletions(-)

diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 962d6fd5e7f..8d37af6321a 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -18,8 +18,6 @@ win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
         \$\$QT_MODULE_INCLUDE_BASE/QtANGLE
 }
 
-contains(QT_CONFIG, dynamicgl): DEFINES += QT_OPENGL_DYNAMIC_IN_GUI
-
 load(qt_module)
 
 # Code coverage with TestCocoon
diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri
index 56aecd49e24..cadba267979 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 025f8b823cf..6eb656cd09b 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