Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9934 from Rmys/master

Browse Source 
qt5-wayland kde_patch
This commit is contained in:
Rmys
2021-12-11 18:27:50 +03:00
committed by GitHub
parent c826c2a564 40dda63612
commit bc61706c3c
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-wayland/files/qt_kde.patch
+4 -4
View File
@@ -838,7 +838,7 @@ index 5b1f4d56..0079dfef 100644
} }
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
index ccebf43d..95d1049c 100644 index ccebf43d..683fe123 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp --- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp +++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
@@ -336,6 +336,8 @@ QWaylandGLContext::QWaylandGLContext(EGLDisplay eglDisplay, QWaylandDisplay *dis @@ -336,6 +336,8 @@ QWaylandGLContext::QWaylandGLContext(EGLDisplay eglDisplay, QWaylandDisplay *dis
@@ -850,18 +850,18 @@ index ccebf43d..95d1049c 100644
updateGLFormat(); updateGLFormat();
} }
@@ -404,7 +406,9 @@ void QWaylandGLContext::updateGLFormat() @@ -404,7 +406,10 @@ void QWaylandGLContext::updateGLFormat()
QWaylandGLContext::~QWaylandGLContext() QWaylandGLContext::~QWaylandGLContext()
{ {
delete m_blitter; delete m_blitter;
- eglDestroyContext(m_eglDisplay, m_context);
+ m_blitter = nullptr; + m_blitter = nullptr;
eglDestroyContext(m_eglDisplay, m_context);
+ if (m_decorationsContext != EGL_NO_CONTEXT) + if (m_decorationsContext != EGL_NO_CONTEXT)
+ eglDestroyContext(m_eglDisplay, m_decorationsContext); + eglDestroyContext(m_eglDisplay, m_decorationsContext);
} }
bool QWaylandGLContext::makeCurrent(QPlatformSurface *surface) bool QWaylandGLContext::makeCurrent(QPlatformSurface *surface)
@@ -439,6 +443,10 @@ bool QWaylandGLContext::makeCurrent(QPlatformSurface *surface) @@ -439,6 +444,10 @@ bool QWaylandGLContext::makeCurrent(QPlatformSurface *surface)
eglSurface = window->eglSurface(); eglSurface = window->eglSurface();
} }
desktop/toolkit/qt5/qt5-wayland/pspec.xml
+7
View File
@@ -85,6 +85,13 @@
</Package> </Package>
<History> <History>
<Update release="24">
<Date>2021-12-11</Date>
<Version>5.15.2</Version>
<Comment>Rebuild kde patch</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="23"> <Update release="23">
<Date>2021-11-10</Date> <Date>2021-11-10</Date>
<Version>5.15.2</Version> <Version>5.15.2</Version>