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

Merge remote-tracking branch 'origin/5.13' into dev

Browse Source 
Conflicts:
	src/client/qwaylandinputdevice.cpp

Change-Id: I20fb102162351b714855258175ed00437e55f072
This commit is contained in:
Liang Qi 2019-08-13 09:20:59 +02:00
commit dc66229bf5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wayland/qwaylandinputdevice.cpp
View File

@ -602,7 +602,7 @@ void QWaylandInputDevice::Pointer::pointer_enter(uint32_t serial, struct wl_surf
invalidateFocus(); invalidateFocus();
} }
mFocus = window->waylandSurface(); mFocus = window->waylandSurface();
connect(mFocus, &QObject::destroyed, this, &Pointer::handleFocusDestroyed); connect(mFocus.data(), &QObject::destroyed, this, &Pointer::handleFocusDestroyed);
mSurfacePos = QPointF(wl_fixed_to_double(sx), wl_fixed_to_double(sy)); mSurfacePos = QPointF(wl_fixed_to_double(sx), wl_fixed_to_double(sy));
mGlobalPos = window->window()->mapToGlobal(mSurfacePos.toPoint()); mGlobalPos = window->window()->mapToGlobal(mSurfacePos.toPoint());
@ -774,7 +774,7 @@ void QWaylandInputDevice::Pointer::pointer_button(uint32_t serial, uint32_t time
void QWaylandInputDevice::Pointer::invalidateFocus() void QWaylandInputDevice::Pointer::invalidateFocus()
{ {
disconnect(mFocus, &QObject::destroyed, this, &Pointer::handleFocusDestroyed); disconnect(mFocus.data(), &QObject::destroyed, this, &Pointer::handleFocusDestroyed);
mFocus = nullptr; mFocus = nullptr;
mEnterSerial = 0; mEnterSerial = 0;
} }