diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-10-27 12:37:02 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-10-28 21:01:58 +0000 |
| commit | ca5d4137aa352d61d796c82b06e2d8f19a07cf10 (patch) | |
| tree | b8208a0ab5349aa8eeffaa2ff04b3bf5f900e9c5 /src/plugins/platforms/minimalegl/qminimaleglwindow.h | |
| parent | f9ec707e4960bf7d5298ee2ba8f22d7506ef54a7 (diff) | |
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>
Diffstat (limited to 'src/plugins/platforms/minimalegl/qminimaleglwindow.h')
| -rw-r--r-- | src/plugins/platforms/minimalegl/qminimaleglwindow.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/platforms/minimalegl/qminimaleglwindow.h b/src/plugins/platforms/minimalegl/qminimaleglwindow.h index ba7f999602..4edeaf4da9 100644 --- a/src/plugins/platforms/minimalegl/qminimaleglwindow.h +++ b/src/plugins/platforms/minimalegl/qminimaleglwindow.h @@ -35,7 +35,6 @@ #define QMINIMALEGLWINDOW_H #include "qminimaleglintegration.h" -#include "qminimaleglscreen.h" #include <qpa/qplatformwindow.h> |