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

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

Browse Source 
Change-Id: If5fcfe5252c1ac1db63ec77136b186a104280b57
This commit is contained in:
Qt Forward Merge Bot 2019-11-23 03:01:14 +01:00
commit 4593b24945
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wayland/client.pro
View File

@ -23,8 +23,8 @@ qtConfig(xkbcommon) {
QT_FOR_PRIVATE += xkbcommon_support-private QT_FOR_PRIVATE += xkbcommon_support-private
} }
qtHaveModule(linuxaccessibility_support_private): \ qtHaveModule(linuxaccessibility_support-private): \
QT_PRIVATE += linuxaccessibility_support_private QT_PRIVATE += linuxaccessibility_support-private
QMAKE_USE += wayland-client QMAKE_USE += wayland-client

3
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);
} }
// 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.state = state;
tp.pressure = tp.state == Qt::TouchPointReleased ? 0 : 1; tp.pressure = tp.state == Qt::TouchPointReleased ? 0 : 1;
} }

7
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
exec([&]{
if (m_config.autoConfigure) if (m_config.autoConfigure)
toplevel->sendCompleteConfigure(); toplevel->sendCompleteConfigure();
}); }, Qt::DirectConnection);
});
} }
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;