diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase-git/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch index cbd0bcd8..de3e2d68 100644 --- a/recipes-qt/qt5/qtbase-git/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch +++ b/recipes-qt/qt5/qtbase-git/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch @@ -1,7 +1,7 @@ -From b8f2fdcd7683058554b5d76b270c5f4bb3d0b91a Mon Sep 17 00:00:00 2001 +From 5d088522706a3533800e51c011c93d3d2ea58a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> Date: Wed, 5 Feb 2014 18:35:08 +0100 -Subject: [PATCH 09/12] eglfs: fix egl error for platforms only supporting one +Subject: [PATCH 09/11] eglfs: fix egl error for platforms only supporting one window/surface MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -27,10 +27,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp -index 2d36c0b..854531e 100644 +index c83b894..b937881 100644 --- a/src/plugins/platforms/eglfs/qeglfswindow.cpp +++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp -@@ -74,6 +74,15 @@ void QEglFSWindow::create() +@@ -66,6 +66,15 @@ void QEglFSWindow::create() m_flags = Created; @@ -46,16 +46,16 @@ index 2d36c0b..854531e 100644 if (window()->type() == Qt::Desktop) return; -@@ -85,7 +94,7 @@ void QEglFSWindow::create() - if (isRaster() && screen->compositingWindow()) +@@ -79,7 +88,7 @@ void QEglFSWindow::create() return; + } -#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) +#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) || defined(EGL_API_FB) // We can have either a single OpenGL window or multiple raster windows. // Other combinations cannot work. qFatal("EGLFS: OpenGL windows cannot be mixed with others."); -@@ -105,6 +114,11 @@ void QEglFSWindow::create() +@@ -99,6 +108,11 @@ void QEglFSWindow::create() resetSurface(); @@ -68,5 +68,5 @@ index 2d36c0b..854531e 100644 if (isRaster()) { -- -2.0.0 +2.1.1 |