diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-04-29 16:09:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-04-29 17:55:20 +0200 |
| commit | b894a8def5d9107663e4968d2d395f5ef3059125 (patch) | |
| tree | f894c50c9e5cbdd7ec102291eb94979977ce5b37 /src/plugins/platforms/cocoa/qnsview.mm | |
| parent | d2304a28ca657634253af26ad803c7f292e6f4cc (diff) | |
| parent | 002112e80516a29efbb6cef721d74c5fc39fc19d (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
mkspecs/features/qml_module.prf
mkspecs/features/qt_common.prf
src/gui/text/qzip.cpp
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/windows/array.h
src/testlib/qtestcase.cpp
src/widgets/dialogs/qfilesystemmodel.h
Change-Id: Ie41c5868415b81f7693c80e045497035504bb210
Diffstat (limited to 'src/plugins/platforms/cocoa/qnsview.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index 908277a1e3..697cece77f 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -747,8 +747,7 @@ QT_WARNING_POP - (void)handleMouseEvent:(NSEvent *)theEvent { - if ([self handleTabletEvent: theEvent]) - return; + bool isTabletEvent = [self handleTabletEvent: theEvent]; QPointF qtWindowPoint; QPointF qtScreenPoint; @@ -777,7 +776,8 @@ QT_WARNING_POP nativeDrag->setLastMouseEvent(theEvent, self); Qt::KeyboardModifiers keyboardModifiers = [QNSView convertKeyModifiers:[theEvent modifierFlags]]; - QWindowSystemInterface::handleMouseEvent(targetView->m_window, timestamp, qtWindowPoint, qtScreenPoint, m_buttons, keyboardModifiers); + QWindowSystemInterface::handleMouseEvent(targetView->m_window, timestamp, qtWindowPoint, qtScreenPoint, m_buttons, keyboardModifiers, + isTabletEvent ? Qt::MouseEventSynthesizedByQt : Qt::MouseEventNotSynthesized); } - (void)handleFrameStrutMouseEvent:(NSEvent *)theEvent |