minimalegl: Reorder includes to avoid EGL native type clashes

Some of the qminimaleglscreen.h includes are not even necessary.
With the inclusion of egl.h (or qt_egl_p.h in 5.7 and up) isolated
to this header, all we need to ensure is that the sources that include
it place the include at a suitable place.

This is not the only possible solution, there are alternatives (each with
its own caveat), but this is likely the least intrusive.

Task-number: QTBUG-56559
Change-Id: I17db031c8e401d9895a417ba3568ad1e4ba30f72
Reviewed-by: Louai Al-Khanji <louai.al-khanji@qt.io>

src/plugins/platforms/minimalegl/qminimaleglintegration.cpp

@@ -52,7 +52,8 @@
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QScreen>
 
-#include <EGL/egl.h>
+// this is where EGL headers are pulled in, make sure it is last
+#include "qminimaleglscreen.h"
 
 QT_BEGIN_NAMESPACE
 

src/plugins/platforms/minimalegl/qminimaleglintegration.h

@@ -34,8 +34,6 @@
 #ifndef QMINIMALEGLINTEGRATION_H
 #define QMINIMALEGLINTEGRATION_H
 
-#include "qminimaleglscreen.h"
-
 #include <qpa/qplatformintegration.h>
 #include <qpa/qplatformscreen.h>
 

src/plugins/platforms/minimalegl/qminimaleglwindow.h

@@ -35,7 +35,6 @@
 #define QMINIMALEGLWINDOW_H
 
 #include "qminimaleglintegration.h"
-#include "qminimaleglscreen.h"
 
 #include <qpa/qplatformwindow.h>