diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 01:00:42 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 01:00:43 +0200 |
| commit | a211c240a9bf92c0a9d1c3703420eff73d4f9cd6 (patch) | |
| tree | a6bca2c76dc4fc90ab64c5b09db1ca1a51367501 /src/gui/kernel | |
| parent | 963941faae561aeadd3b3e97726d1b57e8bccf90 (diff) | |
| parent | 70c053ee684448984b1f762abd3b40884cece2fa (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I9ec6345a38ada55219f3cdfb6bd0d6e9169fe880
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qevent.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index bf00d4a9a3..dc33a83ac0 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -960,6 +960,7 @@ public: friend class QApplication; friend class QApplicationPrivate; friend class QQuickPointerTouchEvent; + friend class QQuickMultiPointTouchArea; }; #if QT_DEPRECATED_SINCE(5, 0) |