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:21:33 +0100 |
commit | d140f2f61499f424983582770af8c28399a373c1 (patch) | |
tree | b05dc03863502293083ded9d61fc344ab5a9da7b /src/gui/kernel | |
parent | bf131e8d2181b3404f5293546ed390999f760404 (diff) | |
parent | 8ffb200153d1b1a8402c875c4961160efb149201 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
examples/widgets/widgets/scribble/mainwindow.cpp
This amends cb54c16584cf3be746a1a536c1e37cb3022a2f1b.
Change-Id: Iaae60a893330524b2973917e23b31f9d51f8bd38
Diffstat (limited to 'src/gui/kernel')
-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 |