diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-09-03 13:32:55 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-09-08 08:02:15 +0200 |
| commit | 0e475eeea65305efd94e38bff8fc806b7cfddd72 (patch) | |
| tree | 2664f9326e9242a6c56adee5f4bc669ddf924b9b /tests/auto/widgets | |
| parent | 2f0f74498a3eb00950688750baccc846d4e11f6b (diff) | |
Refactor testlib touch functions into qtestsupport_gui and _widgets
Because we removed public setters from QTouchEvent and QEventPoint in
4e400369c08db251cd489fec1229398c224d02b4 and now it's proposed to give
QEventPoint a d-pointer again, the implementation of QTouchEventSequence
needs to start using QMutableEventPoint: being a friend will no longer
be enough, because the member variables won't be accessible in the future.
But because we have separate test libs for Gui and Widgets, it needs to
be further refactored into two classes.
Change-Id: I0bfc0978fc4187348ac872e1330d95259d557b69
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/widgets')
| -rw-r--r-- | tests/auto/widgets/kernel/qgesturerecognizer/tst_qgesturerecognizer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/widgets/kernel/qgesturerecognizer/tst_qgesturerecognizer.cpp b/tests/auto/widgets/kernel/qgesturerecognizer/tst_qgesturerecognizer.cpp index fa1bc3e57a..b65f6a5ff6 100644 --- a/tests/auto/widgets/kernel/qgesturerecognizer/tst_qgesturerecognizer.cpp +++ b/tests/auto/widgets/kernel/qgesturerecognizer/tst_qgesturerecognizer.cpp @@ -126,7 +126,7 @@ bool TestWidget::event(QEvent * event) return QWidget::event(event); } -static void pressSequence(QTest::QTouchEventSequence &sequence, QList<QPoint> &points, +static void pressSequence(QTest::QTouchEventWidgetSequence &sequence, QList<QPoint> &points, QWidget *widget) { const int pointCount = points.size(); @@ -135,7 +135,7 @@ static void pressSequence(QTest::QTouchEventSequence &sequence, QList<QPoint> &p sequence.commit(); } -static void linearSequence(int n, const QPoint &delta, QTest::QTouchEventSequence &sequence, +static void linearSequence(int n, const QPoint &delta, QTest::QTouchEventWidgetSequence &sequence, QList<QPoint> &points, QWidget *widget) { const int pointCount = points.size(); @@ -148,7 +148,7 @@ static void linearSequence(int n, const QPoint &delta, QTest::QTouchEventSequenc } } -static void releaseSequence(QTest::QTouchEventSequence &sequence, QList<QPoint> &points, +static void releaseSequence(QTest::QTouchEventWidgetSequence &sequence, QList<QPoint> &points, QWidget *widget) { const int pointCount = points.size(); @@ -188,7 +188,7 @@ void tst_QGestureRecognizer::panGesture() for (int i = 0; i < panPoints; ++i) points.append(QPoint(10 + i *20, 10 + i *20)); - QTest::QTouchEventSequence panSequence = QTest::touchEvent(&widget, m_touchDevice); + QTest::QTouchEventWidgetSequence panSequence = QTest::touchEvent(&widget, m_touchDevice); pressSequence(panSequence, points, &widget); linearSequence(5, QPoint(20, 20), panSequence, points, &widget); releaseSequence(panSequence, points, &widget); @@ -231,7 +231,7 @@ void tst_QGestureRecognizer::pinchGesture() points.append(widget.rect().center()); points.append(points.front() + QPoint(0, 20)); - QTest::QTouchEventSequence pinchSequence = QTest::touchEvent(&widget, m_touchDevice); + QTest::QTouchEventWidgetSequence pinchSequence = QTest::touchEvent(&widget, m_touchDevice); pressSequence(pinchSequence, points, &widget); for (int s = 0; s < 5; ++s) { @@ -288,7 +288,7 @@ void tst_QGestureRecognizer::swipeGesture() for (int i = 0; i < swipePoints - 1; ++i) points.append(fingerDistance + i * fingerDistance); - QTest::QTouchEventSequence swipeSequence = QTest::touchEvent(&widget, m_touchDevice); + QTest::QTouchEventWidgetSequence swipeSequence = QTest::touchEvent(&widget, m_touchDevice); pressSequence(swipeSequence, points, &widget); // Press point #3 |