diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-12-08 10:00:21 +0100 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-12-08 10:08:16 +0000 |
commit | 10143ea8030e6754b2021c84c30859ade79dc570 (patch) | |
tree | 07da8d4cfa132beb1b6fd12347d982ff5051583f /src/gui | |
parent | cae32bd04d117ba2423a8c4db12f8d2d5b809bcb (diff) |
QPointingDeviceUniqueId: remove deprecated numeric() and constructor
Followup to 0484473: this is all new stuff for 5.8 and we don't need
to release it with pre-deprecated functions.
Task-number: QTBUG-54616
Change-Id: If17a4bec6fc36ca78d87517992374f101ae13b4f
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/kernel/qevent.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 7d5b719e09..7881df205a 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -796,10 +796,6 @@ inline bool operator==(QKeySequence::StandardKey key, QKeyEvent *e){return (e ? class Q_GUI_EXPORT QPointingDeviceUniqueId { Q_GADGET - // ### kept these to keep other modules compiling. Remove before 5.8.0 final! -#if QT_DEPRECATED_SINCE(5, 8) - Q_PROPERTY(qint64 numeric READ numericId CONSTANT) -#endif Q_PROPERTY(qint64 numericId READ numericId CONSTANT) public: Q_ALWAYS_INLINE @@ -812,11 +808,6 @@ public: Q_ALWAYS_INLINE Q_DECL_CONSTEXPR bool isValid() const Q_DECL_NOTHROW { return m_numericId != -1; } qint64 numericId() const Q_DECL_NOTHROW; - // ### kept these to keep other modules compiling. Remove before 5.8.0 final! -#if QT_DEPRECATED_SINCE(5, 8) - Q_ALWAYS_INLINE Q_DECL_DEPRECATED qint64 numeric() const { return numericId(); } - Q_ALWAYS_INLINE Q_DECL_DEPRECATED explicit QPointingDeviceUniqueId(qint64 id) : m_numericId(id) {} -#endif private: // TODO: for TUIO 2, or any other type of complex token ID, an internal // array (or hash) can be added to hold additional properties. |