diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 17:30:08 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 17:30:08 +0200 |
commit | f9394275f9b1b6e2c5bea01d661ead00809b934f (patch) | |
tree | f983e3316b44c406c605d570961f95e09c58757f /src/gui/kernel | |
parent | e4ce8d107052a01a8b25097ab243aeccdd636aa7 (diff) | |
parent | 9a09af1cb712ede5720141fcc1b5eadef2fe953f (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ic0dbddfa711905bc8e01aa6cbbdabf056a19587f
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 e80920686f..b463b5b431 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -961,6 +961,7 @@ public: friend class QApplication; friend class QApplicationPrivate; friend class QQuickPointerTouchEvent; + friend class QQuickMultiPointTouchArea; }; #if QT_DEPRECATED_SINCE(5, 0) |