diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2021-01-11 12:13:48 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2021-02-01 09:20:47 +0100 |
| commit | 7821344a885d0d9b6fd800375b2866278f99d85f (patch) | |
| tree | fb931dbf23346fbe78341806f5ed2922f7aec6be /examples/qt3d | |
| parent | 53c3d955bafe75936dd281d479fca9746f5a8990 (diff) | |
Minor fixes to compile against 5.15
Change-Id: Id9574cf23b9af29815d8452915cebfc380fd94d1
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'examples/qt3d')
| -rw-r--r-- | examples/qt3d/audio-visualizer-qml/touchsettings.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/examples/qt3d/audio-visualizer-qml/touchsettings.cpp b/examples/qt3d/audio-visualizer-qml/touchsettings.cpp index 3f70df802..477583de0 100644 --- a/examples/qt3d/audio-visualizer-qml/touchsettings.cpp +++ b/examples/qt3d/audio-visualizer-qml/touchsettings.cpp @@ -49,7 +49,15 @@ ****************************************************************************/ #include "touchsettings.h" -#include <QtGui/QInputDevice> + +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +#define DEVICE QInputDevice +#include <QtGui/QInputDevice +#else +#define DEVICE QTouchDevice +#include <QtGui/QTouchDevice> +#endif + #include <QDebug> TouchSettings::TouchSettings(QObject *parent) @@ -62,10 +70,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 = QInputDevice::devices(); + const auto devices = DEVICE::devices(); bool isTouch = false; - for (const QInputDevice *dev : devices) - if (dev->type() == QInputDevice::DeviceType::TouchScreen) { + for (const DEVICE *dev : devices) + if (dev->type() == DEVICE::DeviceType::TouchScreen) { isTouch = true; break; } |