diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 08:00:01 +0300 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 08:00:01 +0300 |
| commit | 284057d12fea9339744ddc646aa53cfe6c3c95a1 (patch) | |
| tree | 61bb12637c56a282830d683e346057b00d332b7a /src/quicktemplates2/qquickpopup.cpp | |
| parent | 91b2721fdc2aba28d3c45111779fed70f7c4f87d (diff) | |
| parent | c8e9b5f25fb12c3b7983658d738165181b4d6672 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/RoundButton.qml
src/imports/controls/universal/RadioDelegate.qml
Change-Id: I4cb14c19bd5f6e19b70b03fb394c76712e6dda08
Diffstat (limited to 'src/quicktemplates2/qquickpopup.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 8c37ea84..e0c5c653 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -1853,6 +1853,16 @@ bool QQuickPopup::overlayEvent(QQuickItem *item, QEvent *event) } } +void QQuickPopup::touchEvent(QTouchEvent *event) +{ + // TODO: QQuickPopup and QQuickDrawer still rely on synthesized mouse events + event->ignore(); +} + +void QQuickPopup::touchUngrabEvent() +{ +} + #if QT_CONFIG(wheelevent) void QQuickPopup::wheelEvent(QWheelEvent *event) { |