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

Restore signature of qt_handleTouchEvent()

Browse Source 
The function return value changed in commit e1f25b1c8. Anyhow, this
breaks the AUT probe of Squish on Windows, as long as it is built
against an older Qt version.

Squish can of course be adjusted eventually, but let's allow some
grace period.

Fixes: SQUISH-15324
Change-Id: I289ed43bffcf292aa2eae3962a4661ed5c29100e
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 4a29ee770f76e72fe71275d5f987fc9de9af12a0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Kai Köhne 2022-08-31 13:58:48 +02:00 committed by Qt Cherry-pick Bot
parent 9010a4351f
commit d3375534ac
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/kernel/qtestsupport_gui.cpp
View File

@ -99,7 +99,7 @@ bool QTouchEventSequence::commit(bool processEvents)
QThread::msleep(1);
bool ret = false;
if (targetWindow)
ret = qt_handleTouchEvent(targetWindow, device, points.values());
ret = qt_handleTouchEventv2(targetWindow, device, points.values());
if (processEvents)
QCoreApplication::processEvents();
previousPoints = points;

6
src/gui/kernel/qtestsupport_gui.h
View File

@ -12,7 +12,11 @@ QT_BEGIN_NAMESPACE
class QWindow;
Q_GUI_EXPORT bool qt_handleTouchEvent(QWindow *w, const QPointingDevice *device,
Q_GUI_EXPORT void qt_handleTouchEvent(QWindow *w, const QPointingDevice *device,
const QList<QEventPoint> &points,
Qt::KeyboardModifiers mods = Qt::NoModifier);
Q_GUI_EXPORT bool qt_handleTouchEventv2(QWindow *w, const QPointingDevice *device,
const QList<QEventPoint> &points,
Qt::KeyboardModifiers mods = Qt::NoModifier);

8
src/gui/kernel/qwindowsysteminterface.cpp
View File

@ -1203,7 +1203,7 @@ namespace QTest
}
}
Q_GUI_EXPORT bool qt_handleTouchEvent(QWindow *window, const QPointingDevice *device,
Q_GUI_EXPORT bool qt_handleTouchEventv2(QWindow *window, const QPointingDevice *device,
const QList<QEventPoint> &points,
Qt::KeyboardModifiers mods = Qt::NoModifier)
{
@ -1211,5 +1211,11 @@ Q_GUI_EXPORT bool qt_handleTouchEvent(QWindow *window, const QPointingDevice *de
QWindowSystemInterfacePrivate::toNativeTouchPoints(points, window), mods);
}
Q_GUI_EXPORT void qt_handleTouchEvent(QWindow *window, const QPointingDevice *device,
const QList<QEventPoint> &points,
Qt::KeyboardModifiers mods = Qt::NoModifier)
{
qt_handleTouchEventv2(window, device, points, mods);
}
QT_END_NAMESPACE

4
src/widgets/kernel/qtestsupport_widgets.cpp
View File

@ -122,9 +122,9 @@ bool QTouchEventWidgetSequence::commit(bool processEvents)
return ret;
QThread::msleep(1);
if (targetWindow) {
ret = qt_handleTouchEvent(targetWindow, device, points.values());
ret = qt_handleTouchEventv2(targetWindow, device, points.values());
} else if (targetWidget) {
ret = qt_handleTouchEvent(targetWidget->windowHandle(), device, points.values());
ret = qt_handleTouchEventv2(targetWidget->windowHandle(), device, points.values());
}
if (processEvents)
QCoreApplication::processEvents();