From 2c8d77ff3b7e01ca9015e81b533ea4ce333b530b Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Fri, 27 Jan 2023 16:06:54 +0100 Subject: [PATCH] QtGui: Remove double default definition 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 (cherry picked from commit edc62595f27ad820b2edfe2d6158925676131590) Reviewed-by: Qt Cherry-pick Bot --- src/gui/kernel/qwindowsysteminterface.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp index 051fe38a485..ab07002191a 100644 --- a/src/gui/kernel/qwindowsysteminterface.cpp +++ b/src/gui/kernel/qwindowsysteminterface.cpp @@ -1192,8 +1192,8 @@ Q_GUI_EXPORT bool qt_sendShortcutOverrideEvent(QObject *o, ulong timestamp, int namespace QTest { - Q_GUI_EXPORT QPointingDevice * createTouchDevice(QInputDevice::DeviceType devType = QInputDevice::DeviceType::TouchScreen, - QInputDevice::Capabilities caps = QInputDevice::Capability::Position) + Q_GUI_EXPORT QPointingDevice * createTouchDevice(QInputDevice::DeviceType devType, + QInputDevice::Capabilities caps) { static qint64 nextId = 0x100000000; 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, const QList &points, - Qt::KeyboardModifiers mods = Qt::NoModifier) + Qt::KeyboardModifiers mods) { return QWindowSystemInterface::handleTouchEvent(window, device, 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, const QList &points, - Qt::KeyboardModifiers mods = Qt::NoModifier) + Qt::KeyboardModifiers mods) { qt_handleTouchEventv2(window, device, points, mods); }