summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0013-Fix-build-of-egl-integration.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase/0013-Fix-build-of-egl-integration.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0013-Fix-build-of-egl-integration.patch196
1 files changed, 196 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0013-Fix-build-of-egl-integration.patch b/recipes-qt/qt5/qtbase/0013-Fix-build-of-egl-integration.patch
new file mode 100644
index 00000000..1fa4aca4
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0013-Fix-build-of-egl-integration.patch
@@ -0,0 +1,196 @@
1From 2cece4539990f9e7b0239681bd2fc2808aeb8dbc Mon Sep 17 00:00:00 2001
2From: Stephan Binner <stephan.binner@basyskom.com>
3Date: Mon, 2 Feb 2015 13:10:50 +0100
4Subject: [PATCH 13/13] Fix build of egl integration
5
6Add missing includes and reorder includes to avoid X defines breakage
7
8Upstream-Status: Backport from 5.4 branch https://codereview.qt-project.org/#/c/105116/
9
10Change-Id: Iaf95ae2488df3d3301436262ed79f7091b4be0a9
11Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
12Signed-off-by: Stephan Binner <stephan.binner@basyskom.com>
13---
14 .../eglconvenience/qeglplatformcontext_p.h | 1 +
15 .../eglconvenience/qeglplatformintegration_p.h | 2 +-
16 src/plugins/platforms/eglfs/qeglfscontext.cpp | 13 +++++++------
17 src/plugins/platforms/eglfs/qeglfshooks_stub.cpp | 2 +-
18 src/plugins/platforms/eglfs/qeglfsintegration.cpp | 20 ++++++++++----------
19 src/plugins/platforms/eglfs/qeglfsscreen.cpp | 4 +++-
20 src/plugins/platforms/eglfs/qeglfswindow.cpp | 6 ++++--
21 .../platforms/minimalegl/qminimaleglwindow.cpp | 4 ++--
22 8 files changed, 29 insertions(+), 23 deletions(-)
23
24diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h
25index 7825c7b..0c10710 100644
26--- a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h
27+++ b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h
28@@ -45,6 +45,7 @@
29 // We mean it.
30 //
31
32+#include <QtCore/qtextstream.h>
33 #include <qpa/qplatformwindow.h>
34 #include <qpa/qplatformopenglcontext.h>
35 #include <QtCore/QVariant>
36diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
37index c9b6873..a0aab03 100644
38--- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
39+++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
40@@ -45,9 +45,9 @@
41 // We mean it.
42 //
43
44+#include <QtCore/QVariant>
45 #include <qpa/qplatformintegration.h>
46 #include <qpa/qplatformnativeinterface.h>
47-#include <QtCore/QVariant>
48 #include <EGL/egl.h>
49
50 // Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/
51diff --git a/src/plugins/platforms/eglfs/qeglfscontext.cpp b/src/plugins/platforms/eglfs/qeglfscontext.cpp
52index 6216fa8..6470280 100644
53--- a/src/plugins/platforms/eglfs/qeglfscontext.cpp
54+++ b/src/plugins/platforms/eglfs/qeglfscontext.cpp
55@@ -31,15 +31,16 @@
56 **
57 ****************************************************************************/
58
59-#include "qeglfscontext.h"
60-#include "qeglfswindow.h"
61-#include "qeglfshooks.h"
62+#include <QtGui/QSurface>
63+#include <QtDebug>
64
65+#include <QtPlatformSupport/private/qeglplatformcursor_p.h>
66 #include <QtPlatformSupport/private/qeglconvenience_p.h>
67 #include <QtPlatformSupport/private/qeglpbuffer_p.h>
68-#include <QtPlatformSupport/private/qeglplatformcursor_p.h>
69-#include <QtGui/QSurface>
70-#include <QtDebug>
71+
72+#include "qeglfswindow.h"
73+#include "qeglfshooks.h"
74+#include "qeglfscontext.h"
75
76 QT_BEGIN_NAMESPACE
77
78diff --git a/src/plugins/platforms/eglfs/qeglfshooks_stub.cpp b/src/plugins/platforms/eglfs/qeglfshooks_stub.cpp
79index 26d77a2..120c603 100644
80--- a/src/plugins/platforms/eglfs/qeglfshooks_stub.cpp
81+++ b/src/plugins/platforms/eglfs/qeglfshooks_stub.cpp
82@@ -31,10 +31,10 @@
83 **
84 ****************************************************************************/
85
86-#include "qeglfshooks.h"
87 #include <QtPlatformSupport/private/qeglplatformcursor_p.h>
88 #include <QtPlatformSupport/private/qeglconvenience_p.h>
89 #include <QtCore/QRegularExpression>
90+#include "qeglfshooks.h"
91
92 #if defined(Q_OS_LINUX)
93 #include <fcntl.h>
94diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/qeglfsintegration.cpp
95index 2a4eae3..fbdd1d4 100644
96--- a/src/plugins/platforms/eglfs/qeglfsintegration.cpp
97+++ b/src/plugins/platforms/eglfs/qeglfsintegration.cpp
98@@ -31,26 +31,26 @@
99 **
100 ****************************************************************************/
101
102-#include "qeglfsintegration.h"
103+#include <QtCore/qtextstream.h>
104+#include <QtGui/private/qguiapplication_p.h>
105+
106+#include <qpa/qplatformwindow.h>
107+#include <QtGui/QSurfaceFormat>
108+#include <QtGui/QOpenGLContext>
109+#include <QtGui/QScreen>
110+#include <QtGui/QOffscreenSurface>
111+#include <qpa/qplatformcursor.h>
112
113+#include "qeglfsintegration.h"
114 #include "qeglfswindow.h"
115 #include "qeglfshooks.h"
116 #include "qeglfscontext.h"
117
118-#include <QtGui/private/qguiapplication_p.h>
119-
120 #include <QtPlatformSupport/private/qeglconvenience_p.h>
121 #include <QtPlatformSupport/private/qeglplatformcontext_p.h>
122 #include <QtPlatformSupport/private/qeglpbuffer_p.h>
123 #include <QtPlatformHeaders/QEGLNativeContext>
124
125-#include <qpa/qplatformwindow.h>
126-#include <QtGui/QSurfaceFormat>
127-#include <QtGui/QOpenGLContext>
128-#include <QtGui/QScreen>
129-#include <QtGui/QOffscreenSurface>
130-#include <qpa/qplatformcursor.h>
131-
132 #include <EGL/egl.h>
133
134 static void initResources()
135diff --git a/src/plugins/platforms/eglfs/qeglfsscreen.cpp b/src/plugins/platforms/eglfs/qeglfsscreen.cpp
136index cd68540..bc93fe2 100644
137--- a/src/plugins/platforms/eglfs/qeglfsscreen.cpp
138+++ b/src/plugins/platforms/eglfs/qeglfsscreen.cpp
139@@ -31,10 +31,12 @@
140 **
141 ****************************************************************************/
142
143+#include <QtCore/qtextstream.h>
144+#include <QtPlatformSupport/private/qeglplatformcursor_p.h>
145+
146 #include "qeglfsscreen.h"
147 #include "qeglfswindow.h"
148 #include "qeglfshooks.h"
149-#include <QtPlatformSupport/private/qeglplatformcursor_p.h>
150
151 QT_BEGIN_NAMESPACE
152
153diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp
154index 5ebde6d..2c05979 100644
155--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp
156+++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp
157@@ -31,8 +31,7 @@
158 **
159 ****************************************************************************/
160
161-#include "qeglfswindow.h"
162-#include "qeglfshooks.h"
163+#include <QtCore/qtextstream.h>
164 #include <qpa/qwindowsysteminterface.h>
165 #include <qpa/qplatformintegration.h>
166 #include <private/qguiapplication_p.h>
167@@ -40,6 +39,9 @@
168 #include <QtPlatformSupport/private/qeglplatformcursor_p.h>
169 #include <QtPlatformSupport/private/qeglconvenience_p.h>
170
171+#include "qeglfswindow.h"
172+#include "qeglfshooks.h"
173+
174 #include <QtDebug>
175
176 QT_BEGIN_NAMESPACE
177diff --git a/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp b/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp
178index 906a130..d4bee2c 100644
179--- a/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp
180+++ b/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp
181@@ -31,10 +31,10 @@
182 **
183 ****************************************************************************/
184
185-#include "qminimaleglwindow.h"
186-
187 #include <qpa/qwindowsysteminterface.h>
188
189+#include "qminimaleglwindow.h"
190+
191 QT_BEGIN_NAMESPACE
192
193 QMinimalEglWindow::QMinimalEglWindow(QWindow *w)
194--
1952.3.1
196
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-21 23:05:47 +0000