summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qtbase/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
index bbd27b94..200864a9 100644
--- a/recipes-qt/qt5/qtbase/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
+++ b/recipes-qt/qt5/qtbase/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
@@ -1,7 +1,7 @@
1From 3408e6d6c56a18bed48353c2f1b2e18f6716fc4e Mon Sep 17 00:00:00 2001 1From 621d867223a135a9babd452d4918200bc6d0463b Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 5 Feb 2014 18:35:08 +0100 3Date: Wed, 5 Feb 2014 18:35:08 +0100
4Subject: [PATCH 09/13] eglfs: fix egl error for platforms only supporting one 4Subject: [PATCH 09/11] eglfs: fix egl error for platforms only supporting one
5 window/surface 5 window/surface
6MIME-Version: 1.0 6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8 7Content-Type: text/plain; charset=UTF-8
@@ -27,10 +27,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
27 1 file changed, 15 insertions(+), 1 deletion(-) 27 1 file changed, 15 insertions(+), 1 deletion(-)
28 28
29diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp 29diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp
30index 2d36c0b..854531e 100644 30index f5839e0..5ebde6d 100644
31--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp 31--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp
32+++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp 32+++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp
33@@ -74,6 +74,15 @@ void QEglFSWindow::create() 33@@ -66,6 +66,15 @@ void QEglFSWindow::create()
34 34
35 m_flags = Created; 35 m_flags = Created;
36 36
@@ -46,16 +46,16 @@ index 2d36c0b..854531e 100644
46 if (window()->type() == Qt::Desktop) 46 if (window()->type() == Qt::Desktop)
47 return; 47 return;
48 48
49@@ -85,7 +94,7 @@ void QEglFSWindow::create() 49@@ -79,7 +88,7 @@ void QEglFSWindow::create()
50 if (isRaster() && screen->compositingWindow())
51 return; 50 return;
51 }
52 52
53-#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) 53-#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK)
54+#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) || defined(EGL_API_FB) 54+#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) || defined(EGL_API_FB)
55 // We can have either a single OpenGL window or multiple raster windows. 55 // We can have either a single OpenGL window or multiple raster windows.
56 // Other combinations cannot work. 56 // Other combinations cannot work.
57 qFatal("EGLFS: OpenGL windows cannot be mixed with others."); 57 qFatal("EGLFS: OpenGL windows cannot be mixed with others.");
58@@ -105,6 +114,11 @@ void QEglFSWindow::create() 58@@ -99,6 +108,11 @@ void QEglFSWindow::create()
59 59
60 resetSurface(); 60 resetSurface();
61 61
@@ -68,5 +68,5 @@ index 2d36c0b..854531e 100644
68 68
69 if (isRaster()) { 69 if (isRaster()) {
70-- 70--
712.1.1 712.1.3
72 72