summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-07-24 14:27:24 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2020-07-27 11:33:44 +0200
commite73b431baa752cef4387cf9e204c27ee476f9acf (patch)
treed1de342f38e4d1b5ff80a13dd966907a4fda5343
parentc5e5eb2d55b2b9112a3766e288fbb1e2e68a5a7d (diff)
Replace QTouchDevice with QInputDevice
Its DeviceType also becomes an enum class, so needs one more layer of namespace prefix. Change-Id: Iec519721f30811d91348de92a11ffc82ba86e81d Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-rw-r--r--examples/qt3d/audio-visualizer-qml/touchsettings.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/qt3d/audio-visualizer-qml/touchsettings.cpp b/examples/qt3d/audio-visualizer-qml/touchsettings.cpp
index 312dfa7e6..3f70df802 100644
--- a/examples/qt3d/audio-visualizer-qml/touchsettings.cpp
+++ b/examples/qt3d/audio-visualizer-qml/touchsettings.cpp
@@ -49,7 +49,7 @@
****************************************************************************/
#include "touchsettings.h"
-#include <QtGui/QTouchDevice>
+#include <QtGui/QInputDevice>
#include <QDebug>
TouchSettings::TouchSettings(QObject *parent)
@@ -62,10 +62,10 @@ bool TouchSettings::isHoverEnabled() const
#if defined(Q_OS_IOS) || defined(Q_OS_ANDROID) || defined(Q_OS_QNX) || defined(Q_OS_WINRT)
return false;
#else
- const auto devices = QTouchDevice::devices();
+ const auto devices = QInputDevice::devices();
bool isTouch = false;
- for (const QTouchDevice *dev : devices)
- if (dev->type() == QTouchDevice::TouchScreen) {
+ for (const QInputDevice *dev : devices)
+ if (dev->type() == QInputDevice::DeviceType::TouchScreen) {
isTouch = true;
break;
}