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

QtGui: Remove double default definition

Browse Source 
In all the cases below, the parameters are defined in the
qtestsupport_gui.h as well.

Task-number: QTBUG-109394
Change-Id: I3311d6c23b3a811dbe20286bd4534ca1ed7cd7f3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit edc62595f27ad820b2edfe2d6158925676131590)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Amir Masoud Abdol 2023-01-27 16:06:54 +01:00 committed by Qt Cherry-pick Bot
parent 668560f8bd
commit 2c8d77ff3b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1192,8 +1192,8 @@ Q_GUI_EXPORT bool qt_sendShortcutOverrideEvent(QObject *o, ulong timestamp, int
namespace QTest namespace QTest
{ {
Q_GUI_EXPORT QPointingDevice * createTouchDevice(QInputDevice::DeviceType devType = QInputDevice::DeviceType::TouchScreen, Q_GUI_EXPORT QPointingDevice * createTouchDevice(QInputDevice::DeviceType devType,
QInputDevice::Capabilities caps = QInputDevice::Capability::Position) QInputDevice::Capabilities caps)
{ {
static qint64 nextId = 0x100000000; static qint64 nextId = 0x100000000;
QPointingDevice *ret = new QPointingDevice("test touch device"_L1, nextId++, QPointingDevice *ret = new QPointingDevice("test touch device"_L1, nextId++,
@ -1206,7 +1206,7 @@ namespace QTest
Q_GUI_EXPORT bool qt_handleTouchEventv2(QWindow *window, const QPointingDevice *device, Q_GUI_EXPORT bool qt_handleTouchEventv2(QWindow *window, const QPointingDevice *device,
const QList<QEventPoint> &points, const QList<QEventPoint> &points,
Qt::KeyboardModifiers mods = Qt::NoModifier) Qt::KeyboardModifiers mods)
{ {
return QWindowSystemInterface::handleTouchEvent<QWindowSystemInterface::SynchronousDelivery>(window, device, return QWindowSystemInterface::handleTouchEvent<QWindowSystemInterface::SynchronousDelivery>(window, device,
QWindowSystemInterfacePrivate::toNativeTouchPoints(points, window), mods); QWindowSystemInterfacePrivate::toNativeTouchPoints(points, window), mods);
@ -1214,7 +1214,7 @@ Q_GUI_EXPORT bool qt_handleTouchEventv2(QWindow *window, const QPointingDevice *
Q_GUI_EXPORT void qt_handleTouchEvent(QWindow *window, const QPointingDevice *device, Q_GUI_EXPORT void qt_handleTouchEvent(QWindow *window, const QPointingDevice *device,
const QList<QEventPoint> &points, const QList<QEventPoint> &points,
Qt::KeyboardModifiers mods = Qt::NoModifier) Qt::KeyboardModifiers mods)
{ {
qt_handleTouchEventv2(window, device, points, mods); qt_handleTouchEventv2(window, device, points, mods);
} }