diff options
Diffstat (limited to 'src/widgets/kernel/qapplication.cpp')
| -rw-r--r-- | src/widgets/kernel/qapplication.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index bcf10ad8ed2..6fcfcf1b1ef 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -2733,7 +2733,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) QPointer<QWidget> pw = w; while (w) { - QMouseEvent me(mouse->type(), relpos, mouse->scenePosition(), mouse->globalPosition().toPoint(), + QMouseEvent me(mouse->type(), relpos, mouse->scenePosition(), mouse->globalPosition(), mouse->button(), mouse->buttons(), mouse->modifiers(), mouse->source(), mouse->pointingDevice()); me.m_spont = mouse->spontaneous(); @@ -2767,7 +2767,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) w = static_cast<QWidget *>(receiver); relpos = mouse->position().toPoint(); - QPoint diff = relpos - w->mapFromGlobal(mouse->globalPosition().toPoint()); + QPoint diff = relpos - w->mapFromGlobal(mouse->globalPosition()).toPoint(); while (w) { if (w->testAttribute(Qt::WA_Hover) && (!QApplication::activePopupWidget() || QApplication::activePopupWidget() == w->window())) { @@ -2781,8 +2781,6 @@ bool QApplication::notify(QObject *receiver, QEvent *e) w = w->parentWidget(); } } - - d->hoverGlobalPos = mouse->globalPosition().toPoint(); break; } #if QT_CONFIG(wheelevent) @@ -3803,7 +3801,7 @@ bool QApplicationPrivate::translateRawTouchEvent(QWidget *window, const QTouchEv window = QApplication::topLevelAt(touchPoint.globalPosition().toPoint()); if (!window) continue; - target = window->childAt(window->mapFromGlobal(touchPoint.globalPosition().toPoint())); + target = window->childAt(window->mapFromGlobal(touchPoint.globalPosition())); if (!target) target = window; } |