diff options
| author | Jan Arve Saether <jan-arve.saether@qt.io> | 2016-10-11 09:59:35 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2016-10-11 08:05:52 +0000 |
| commit | 7a30dda40bd5e24235c88b610ee9e996ed910793 (patch) | |
| tree | 5040aeb0f236c846d173829fed1850d98924c6c1 /src/gui/kernel/qtouchdevice_p.h | |
| parent | 46804956cbe3cd5ddfb0528ae7d9fa35a031d6d3 (diff) | |
Revert "Combine device and point id into 32 bit point id"
The patch is good, but currently breaks touchmouse test in qtdeclarative.
We need to fix the touchmouse test first, then go ahead and reapply this
patch once qtdeclarative is fixed.
This reverts commit cd26e66c2e8ddde06b5e22ef28d815ac1082a7c4.
Change-Id: I222e6240f5ff0eff9c8a3544819499847f6b48fa
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/gui/kernel/qtouchdevice_p.h')
| -rw-r--r-- | src/gui/kernel/qtouchdevice_p.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gui/kernel/qtouchdevice_p.h b/src/gui/kernel/qtouchdevice_p.h index 18d2af46a7..203d9fca74 100644 --- a/src/gui/kernel/qtouchdevice_p.h +++ b/src/gui/kernel/qtouchdevice_p.h @@ -64,21 +64,16 @@ public: : type(QTouchDevice::TouchScreen), caps(QTouchDevice::Position), maxTouchPoints(1) - { - static quint8 nextId = 2; // device 0 is not used, device 1 is for mouse device - id = nextId++; - } + { } QTouchDevice::DeviceType type; QTouchDevice::Capabilities caps; QString name; int maxTouchPoints; - quint8 id; static void registerDevice(const QTouchDevice *dev); static void unregisterDevice(const QTouchDevice *dev); static bool isRegistered(const QTouchDevice *dev); - static QTouchDevicePrivate *get(QTouchDevice *q) { return q->d; } }; QT_END_NAMESPACE |