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

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

Browse Source 
Change-Id: I24b2eade3e8946a654ef6cf3d02ea95255aa1c00
This commit is contained in:
Qt Forward Merge Bot 2019-11-12 03:05:02 +01:00
commit f2e7a1ddd3
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1381,7 +1381,10 @@ void QWaylandInputDevice::handleTouchPoint(int id, Qt::TouchPointState state, co
tp.area.moveCenter(globalPosition); tp.area.moveCenter(globalPosition);
} }
tp.state = state; // If the touch point was pressed earlier this frame, we don't want to overwrite its state.
if (tp.state != Qt::TouchPointPressed)
tp.state = state;
tp.pressure = tp.state == Qt::TouchPointReleased ? 0 : 1; tp.pressure = tp.state == Qt::TouchPointReleased ? 0 : 1;
} }

11
tests/auto/wayland/shared/mockcompositor.cpp
View File

@ -58,13 +58,10 @@ DefaultCompositor::DefaultCompositor()
}); });
}); });
QObject::connect(get<XdgWmBase>(), &XdgWmBase::toplevelCreated, [&] (XdgToplevel *toplevel) { QObject::connect(get<XdgWmBase>(), &XdgWmBase::toplevelCreated, get<XdgWmBase>(), [&] (XdgToplevel *toplevel) {
// Needed because lambdas don't support Qt::DirectConnection if (m_config.autoConfigure)
exec([&]{ toplevel->sendCompleteConfigure();
if (m_config.autoConfigure) }, Qt::DirectConnection);
toplevel->sendCompleteConfigure();
});
});
} }
Q_ASSERT(isClean()); Q_ASSERT(isClean());
} }

2
tests/auto/wayland/shared/xdgshell.cpp
View File

@ -83,7 +83,7 @@ XdgSurface::XdgSurface(XdgWmBase *xdgWmBase, Surface *surface, wl_client *client
{ {
QVERIFY(!surface->m_pending.buffer); QVERIFY(!surface->m_pending.buffer);
QVERIFY(!surface->m_committed.buffer); QVERIFY(!surface->m_committed.buffer);
connect(this, &XdgSurface::toplevelCreated, xdgWmBase, &XdgWmBase::toplevelCreated); connect(this, &XdgSurface::toplevelCreated, xdgWmBase, &XdgWmBase::toplevelCreated, Qt::DirectConnection);
connect(surface, &Surface::attach, this, &XdgSurface::verifyConfigured); connect(surface, &Surface::attach, this, &XdgSurface::verifyConfigured);
connect(surface, &Surface::commit, this, [this] { connect(surface, &Surface::commit, this, [this] {
m_committed = m_pending; m_committed = m_pending;