diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-15 01:00:11 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-11-15 16:29:40 +0100 |
| commit | adc7bbe910a4b89a579ffa93da5a937cfc1379f4 (patch) | |
| tree | e28a2fadc82652798302cc7f79a6f4310a2eb8d7 /src/gui/kernel/qevent.h | |
| parent | 14bb413309092adc53e8451daff5690c4698c07d (diff) | |
| parent | c15a069830baf87f57c84e86326cf86ba9a39713 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/gui/rhi/qshader.cpp
tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
Change-Id: I1c4ae718eb3592a0a0a90af9d11553f3ab68cad5
Diffstat (limited to 'src/gui/kernel/qevent.h')
| -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 |