From 63ec10353db7aaaf227f769398056b6fd42f9b7d Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Wed, 4 May 2016 10:44:53 +0200
Subject: Revert "egl: Reshuffle headers to help less fortunate systems with
 X11"

This reverts commit ecf127505effbbf4dbfd1e7cb9561de5dae51bf2.

ecf12750 breaks the build of qtwayland.

Change-Id: If8bf04f035aa47e4e867d201ec7d95b0d3e18317
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
---
 src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglinclude.h | 2 +-
 src/plugins/platforms/xcb/qxcbintegration.cpp                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/plugins/platforms/xcb')

diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglinclude.h b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglinclude.h
index ce655462e4..ec59cbc7c9 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglinclude.h
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglinclude.h
@@ -40,7 +40,7 @@
 #include <QtGui/private/qcssparser_p.h>
 #include <QtGui/private/qtextengine_p.h>
 
-#include <QtPlatformSupport/private/qt_egl_p.h>
+#include <EGL/egl.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp
index 1176ee10c9..94e17a2983 100644
--- a/src/plugins/platforms/xcb/qxcbintegration.cpp
+++ b/src/plugins/platforms/xcb/qxcbintegration.cpp
@@ -59,7 +59,7 @@
 #include <QtGui/private/qguiapplication_p.h>
 
 #ifdef XCB_USE_EGL
-#include <QtPlatformSupport/private/qt_egl_p.h>
+#include <EGL/egl.h>
 #endif
 
 #ifdef XCB_USE_XLIB
-- 
cgit v1.2.3