1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.8.0' into 5.8

Browse Source 
Conflicts:
	src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h

Change-Id: Ie45a13d3c866d0503e6e31b2a53b70f3420c5066
This commit is contained in:
Liang Qi 2017-01-26 01:05:17 +01:00
commit fab1e8a5a6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -225,7 +225,8 @@ void QWaylandWindow::reset()
mShellSurface = 0; mShellSurface = 0;
delete mSubSurfaceWindow; delete mSubSurfaceWindow;
mSubSurfaceWindow = 0; mSubSurfaceWindow = 0;
destroy(); if (isInitialized())
destroy();
if (mFrameCallback) if (mFrameCallback)
wl_callback_destroy(mFrameCallback); wl_callback_destroy(mFrameCallback);
@ -353,8 +354,11 @@ void QWaylandWindow::setMask(const QRegion &mask)
mMask = mask; mMask = mask;
if (!isInitialized())
return;
if (mMask.isEmpty()) { if (mMask.isEmpty()) {
set_input_region(0); set_input_region(nullptr);
} else { } else {
struct ::wl_region *region = mDisplay->createRegion(mMask); struct ::wl_region *region = mDisplay->createRegion(mMask);
set_input_region(region); set_input_region(region);