qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix warning from deprecated QMouseEvent constructor 

Calculate and pass the global pos explicitly.

Pick-to: 6.3
Change-Id: I6d16a21e95454a65a80d5366c6c46b3cacf33dd3
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
This commit is contained in:
Volker Hilsheimer 2022-03-20 13:40:37 +01:00
parent 9a2bbcd21b
commit 17c9993dd5
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/benchmarks/quick/events/tst_events.cpp
View File

@ -76,11 +76,13 @@ void tst_events::mousePressRelease()
QQuickMouseArea *mouseArea = window.rootObject()->findChild<QQuickMouseArea *>("mouseArea"); QQuickMouseArea *mouseArea = window.rootObject()->findChild<QQuickMouseArea *>("mouseArea");
QCOMPARE(mouseArea->pressed(), false); QCOMPARE(mouseArea->pressed(), false);
const QPoint localPos(100, 100);
const QPoint globalPos = window.mapToGlobal(localPos);
QBENCHMARK { QBENCHMARK {
QMouseEvent pressEvent(QEvent::MouseButtonPress, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, {}); QMouseEvent pressEvent(QEvent::MouseButtonPress, localPos, globalPos, Qt::LeftButton, Qt::LeftButton, {});
window.handleEvent(&pressEvent); window.handleEvent(&pressEvent);
QCOMPARE(mouseArea->pressed(), true); QCOMPARE(mouseArea->pressed(), true);
QMouseEvent releaseEvent(QEvent::MouseButtonRelease, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, {}); QMouseEvent releaseEvent(QEvent::MouseButtonRelease, localPos, globalPos, Qt::LeftButton, Qt::LeftButton, {});
window.handleEvent(&releaseEvent); window.handleEvent(&releaseEvent);
} }
QCOMPARE(mouseArea->pressed(), false); QCOMPARE(mouseArea->pressed(), false);
@ -89,19 +91,23 @@ void tst_events::mousePressRelease()
void tst_events::mouseMove() void tst_events::mouseMove()
{ {
QQuickMouseArea *mouseArea = window.rootObject()->findChild<QQuickMouseArea *>("mouseArea"); QQuickMouseArea *mouseArea = window.rootObject()->findChild<QQuickMouseArea *>("mouseArea");
const QPoint localPos1(100, 100);
const QPoint globalPos1 = window.mapToGlobal(localPos1);
const QPoint localPos2(101, 100);
const QPoint globalPos2 = window.mapToGlobal(localPos2);
QCOMPARE(mouseArea->pressed(), false); QCOMPARE(mouseArea->pressed(), false);
QMouseEvent pressEvent(QEvent::MouseButtonPress, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, {}); QMouseEvent pressEvent(QEvent::MouseButtonPress, localPos1, globalPos1, Qt::LeftButton, Qt::LeftButton, {});
window.handleEvent(&pressEvent); window.handleEvent(&pressEvent);
QCOMPARE(mouseArea->pressed(), true); QCOMPARE(mouseArea->pressed(), true);
QMouseEvent moveEvent1(QEvent::MouseMove, QPoint(101, 100), Qt::LeftButton, Qt::LeftButton, {}); QMouseEvent moveEvent1(QEvent::MouseMove, localPos2, globalPos2, Qt::LeftButton, Qt::LeftButton, {});
QMouseEvent moveEvent2(QEvent::MouseMove, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, {}); QMouseEvent moveEvent2(QEvent::MouseMove, localPos1, globalPos1, Qt::LeftButton, Qt::LeftButton, {});
QBENCHMARK { QBENCHMARK {
window.handleEvent(&moveEvent1); window.handleEvent(&moveEvent1);
window.handleEvent(&moveEvent2); window.handleEvent(&moveEvent2);
} }
QCOMPARE(mouseArea->pressed(), true); QCOMPARE(mouseArea->pressed(), true);
QMouseEvent releaseEvent(QEvent::MouseButtonRelease, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, {}); QMouseEvent releaseEvent(QEvent::MouseButtonRelease, localPos1, globalPos1, Qt::LeftButton, Qt::LeftButton, {});
window.handleEvent(&releaseEvent); window.handleEvent(&releaseEvent);
QCOMPARE(mouseArea->pressed(), false); QCOMPARE(mouseArea->pressed(), false);
} }