diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-13 07:20:23 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-11-13 07:24:05 +0100 |
| commit | 8693c07a8090e0449171f0bb9197d82c3075f833 (patch) | |
| tree | 30d7d295eb2c8c3bc0eb42d929efc72a2f77011c /src/gui | |
| parent | aef07a433f16f5ed3800ee60e11116f78f13d3c4 (diff) | |
| parent | d140f2f61499f424983582770af8c28399a373c1 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qevent.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index dc33a83ac0..f363ece48b 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -853,7 +853,14 @@ private: qint64 m_numericId; }; Q_DECLARE_TYPEINFO(QPointingDeviceUniqueId, Q_MOVABLE_TYPE); + +#if 0 +#pragma qt_sync_suspend_processing +#endif template <> class QList<QPointingDeviceUniqueId> {}; // to prevent instantiation: use QVector instead +#if 0 +#pragma qt_sync_resume_processing +#endif Q_GUI_EXPORT bool operator==(QPointingDeviceUniqueId lhs, QPointingDeviceUniqueId rhs) noexcept; inline bool operator!=(QPointingDeviceUniqueId lhs, QPointingDeviceUniqueId rhs) noexcept |