alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes for building plasma-framework with Qt 5.5

Browse Source 
REVIEW: 129203
REVIEW: 129065
This commit is contained in:
Alberto Curro 2016-10-17 16:45:49 +01:00 committed by David Edmundson
parent 07c978f619
commit f82d76eb2b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/declarativeimports/core/windowthumbnail.cpp
View File

@ -219,6 +219,14 @@ void WindowThumbnail::releaseResources()
//only one (or none) should be set, but never both //only one (or none) should be set, but never both
Q_ASSERT(m_glxPixmap == XCB_PIXMAP_NONE || m_image == EGL_NO_IMAGE_KHR); Q_ASSERT(m_glxPixmap == XCB_PIXMAP_NONE || m_image == EGL_NO_IMAGE_KHR);
#endif #endif
#if HAVE_GLX || HAVE_EGL
// NoStage is supported since Qt >= 5.6.x
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
QQuickWindow::RenderStage m_renderStage = QQuickWindow::NoStage;
#else
QQuickWindow::RenderStage m_renderStage = QQuickWindow::BeforeSynchronizingStage;
#endif
#endif
//data is deleted in the render thread (with relevant GLX calls) //data is deleted in the render thread (with relevant GLX calls)
//note runnable may be called *after* this is deleted //note runnable may be called *after* this is deleted
@ -228,7 +236,7 @@ void WindowThumbnail::releaseResources()
window()->scheduleRenderJob(new DiscardGlxPixmapRunnable(m_texture, window()->scheduleRenderJob(new DiscardGlxPixmapRunnable(m_texture,
m_releaseTexImage, m_releaseTexImage,
m_glxPixmap), m_glxPixmap),
QQuickWindow::NoStage); m_renderStage);
m_glxPixmap = XCB_PIXMAP_NONE; m_glxPixmap = XCB_PIXMAP_NONE;
m_texture = 0; m_texture = 0;
@ -239,7 +247,7 @@ void WindowThumbnail::releaseResources()
window()->scheduleRenderJob(new DiscardEglPixmapRunnable(m_texture, window()->scheduleRenderJob(new DiscardEglPixmapRunnable(m_texture,
m_eglDestroyImageKHR, m_eglDestroyImageKHR,
m_image), m_image),
QQuickWindow::NoStage); m_renderStage);
m_image = EGL_NO_IMAGE_KHR; m_image = EGL_NO_IMAGE_KHR;
m_texture = 0; m_texture = 0;