diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-17 01:01:01 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-17 01:01:01 +0200 |
| commit | 6f27bb135246b7fe9d11ba58e05d2b7661bc2080 (patch) | |
| tree | 9704e1c4ffb775472a9984872c3bd292faa999a5 /tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp | |
| parent | dc4212b3a694e143595968419ae5ad695ab2aa03 (diff) | |
| parent | c222a9283d94ad1e29334bb2fba0beef7cc716c7 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ica69de99be9c8af4d28a52e4b69e6af748ed983c
Diffstat (limited to 'tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp')
| -rw-r--r-- | tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp b/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp index a17a9f6c33..01ecfb2ca9 100644 --- a/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp +++ b/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp @@ -356,7 +356,7 @@ void tst_QAbstractScrollArea::patternBackground() widget.resize(600, 600); scrollArea.setWidget(&widget); topLevel.show(); - QVERIFY(QTest::qWaitForWindowActive(&topLevel)); + QVERIFY(QTest::qWaitForWindowExposed(&topLevel)); QLinearGradient linearGrad(QPointF(250, 250), QPointF(300, 300)); linearGrad.setColorAt(0, Qt::yellow); |