diff options
Diffstat (limited to 'src/plugins/platforms/ios/qiosintegration.mm')
| -rw-r--r-- | src/plugins/platforms/ios/qiosintegration.mm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm index 7352e68562..962456965a 100644 --- a/src/plugins/platforms/ios/qiosintegration.mm +++ b/src/plugins/platforms/ios/qiosintegration.mm @@ -53,7 +53,7 @@ #include "qiosservices.h" #include "qiosoptionalplugininterface.h" -#include <QtGui/qtouchdevice.h> +#include <QtGui/qpointingdevice.h> #include <QtGui/private/qguiapplication_p.h> #include <qoffscreensurface.h> @@ -117,13 +117,13 @@ void QIOSIntegration::initialize() // Depends on a primary screen being present m_inputContext = new QIOSInputContext; - m_touchDevice = new QTouchDevice; - m_touchDevice->setType(QTouchDevice::TouchScreen); - QTouchDevice::Capabilities touchCapabilities = QTouchDevice::Position | QTouchDevice::NormalizedPosition; + m_touchDevice = new QPointingDevice; + m_touchDevice->setType(QInputDevice::DeviceType::TouchScreen); + QPointingDevice::Capabilities touchCapabilities = QPointingDevice::Capability::Position | QPointingDevice::Capability::NormalizedPosition; if (mainScreen.traitCollection.forceTouchCapability == UIForceTouchCapabilityAvailable) - touchCapabilities |= QTouchDevice::Pressure; + touchCapabilities |= QPointingDevice::Capability::Pressure; m_touchDevice->setCapabilities(touchCapabilities); - QWindowSystemInterface::registerTouchDevice(m_touchDevice); + QWindowSystemInterface::registerInputDevice(m_touchDevice); #if QT_CONFIG(tabletevent) QWindowSystemInterfacePrivate::TabletEvent::setPlatformSynthesizesMouse(false); #endif @@ -280,7 +280,7 @@ QPlatformTheme *QIOSIntegration::createPlatformTheme(const QString &name) const return QPlatformIntegration::createPlatformTheme(name); } -QTouchDevice *QIOSIntegration::touchDevice() +QPointingDevice *QIOSIntegration::touchDevice() { return m_touchDevice; } |