1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some compile warnings

Browse Source 
QTouchEvent::touchPoints() is deprecated and replaced by just
points(), and there is a new value in Qt::TouchPointState.

normalizedPos() is replaced by normalizedPosition().

And QVariant::type() is deprecated.

Change-Id: I4a4eea2775030f67ad12488df25d4859099c1783
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2020-10-27 14:36:38 +01:00
parent b18aba6a42
commit f2bc2a7c19
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/wayland/seatv5/tst_seatv5.cpp
View File

@ -421,7 +421,7 @@ public:
explicit Event(const QTouchEvent *event) explicit Event(const QTouchEvent *event)
: type(event->type()) : type(event->type())
, touchPointStates(event->touchPointStates()) , touchPointStates(event->touchPointStates())
, touchPoints(event->touchPoints()) , touchPoints(event->points())
{ {
} }
QEvent::Type type{}; QEvent::Type type{};
@ -506,7 +506,7 @@ void tst_seatv5::multiTouch()
t->sendDown(xdgToplevel()->surface(), {48, 48}, 1); t->sendDown(xdgToplevel()->surface(), {48, 48}, 1);
t->sendFrame(c); t->sendFrame(c);
// Compositor event order should not change the order of the QTouchEvent::touchPoints() // Compositor event order should not change the order of the QTouchEvent::points()
// See QTBUG-77014 // See QTBUG-77014
t->sendMotion(c, {49, 48}, 1); t->sendMotion(c, {49, 48}, 1);
t->sendMotion(c, {33, 32}, 0); t->sendMotion(c, {33, 32}, 0);