1 files changed, 22 insertions, 32 deletions
diff --git a/src/plugins/platforms/windows/qwindowsnativeinterface.cpp b/src/plugins/platforms/windows/qwindowsnativeinterface.cpp
index 06c0122bbb..7d274f330f 100644
--- a/src/plugins/platforms/windows/qwindowsnativeinterface.cpp
+++ b/src/plugins/platforms/windows/qwindowsnativeinterface.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -42,21 +42,11 @@
 #include "qwindowsnativeinterface.h"
 #include "qwindowswindow.h"
 #include "qwindowscontext.h"
-
-#if defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC)
-#  include "qwindowseglcontext.h"
-#  include <QtGui/QOpenGLContext>
-#endif
-
-#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
-#  include "qwindowsglcontext.h"
-#endif
-
-#if !defined(QT_NO_OPENGL)
-#  include <QtGui/QOpenGLFunctions>
-#endif
+#include "qwindowsopenglcontext.h"
+#include "qwindowsintegration.h"
 
 #include <QtGui/QWindow>
+#include <QtGui/QOpenGLContext>
 
 QT_BEGIN_NAMESPACE
 
@@ -117,6 +107,16 @@ QVariantMap QWindowsNativeInterface::windowProperties(QPlatformWindow *window) c
     return result;
 }
 
+void *QWindowsNativeInterface::nativeResourceForIntegration(const QByteArray &resource)
+{
+#ifndef QT_NO_OPENGL
+    if (resource == QByteArrayLiteral("glhandle"))
+        return QWindowsIntegration::staticOpenGLContext()->moduleHandle();
+#endif
+
+    return 0;
+}
+
 #ifndef QT_NO_OPENGL
 void *QWindowsNativeInterface::nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context)
 {
@@ -124,24 +124,14 @@ void *QWindowsNativeInterface::nativeResourceForContext(const QByteArray &resour
         qWarning("%s: '%s' requested for null context or context without handle.", __FUNCTION__, resource.constData());
         return 0;
     }
-#if defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC)
-    if (QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGL) {
-        QWindowsEGLContext *windowsEglContext = static_cast<QWindowsEGLContext *>(context->handle());
-        if (resource == QByteArrayLiteral("eglDisplay"))
-            return windowsEglContext->eglDisplay();
-        if (resource == QByteArrayLiteral("eglContext"))
-            return windowsEglContext->eglContext();
-        if (resource == QByteArrayLiteral("eglConfig"))
-            return windowsEglContext->eglConfig();
-    }
-#endif // QT_OPENGL_ES_2 || QT_OPENGL_DYNAMIC
-#if !defined(QT_OPENGL_ES_2)
-    if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL) {
-        QWindowsGLContext *windowsContext = static_cast<QWindowsGLContext *>(context->handle());
-        if (resource == QByteArrayLiteral("renderingContext"))
-            return windowsContext->renderingContext();
-    }
-#endif // QT_OPENGL_ES_2 || QT_OPENGL_DYNAMIC
+
+    QWindowsOpenGLContext *glcontext = static_cast<QWindowsOpenGLContext *>(context->handle());
+    if (resource == QByteArrayLiteral("renderingContext") || resource == QByteArrayLiteral("eglContext"))
+        return glcontext->nativeContext();
+    if (resource == QByteArrayLiteral("eglDisplay"))
+        return glcontext->nativeDisplay();
+    if (resource == QByteArrayLiteral("eglConfig"))
+        return glcontext->nativeConfig();
 
     qWarning("%s: Invalid key '%s' requested.", __FUNCTION__, resource.constData());
     return 0;