diff options
| author | Frédéric Lefebvre <frederic.lefebvre@qt.io> | 2025-09-02 13:19:21 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2026-03-10 04:15:07 +0000 |
| commit | 70628151ecf1c4ccb25affb4278ebbacafe7bc41 (patch) | |
| tree | f5e120d55228fae89fb878d69a4fb364706cce4c | |
| parent | 54b20152031ec63b7184878333a6ab2301a234ff (diff) | |
Remove redundant calls to requestActivate in tst_QQuickIconImage
tst_QQuickIconImage include calls to requestActivate() after a
window is shown. This call is superfluous for the current test and
should be removed.
Remove the unnecessary requestActivate() calls to simplify the code.
Task-number: QTBUG-139705
Change-Id: Iee86c7f602a77a654d8b82c17cf717b28bc7fdae
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit 87cfcf514e280c1f97aa1e57781e762575b089f1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 58bca9087be3a1d1269e79ed8de5775bc7aa1f36)
| -rw-r--r-- | tests/auto/quickcontrols/qquickiconimage/tst_qquickiconimage.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/tests/auto/quickcontrols/qquickiconimage/tst_qquickiconimage.cpp b/tests/auto/quickcontrols/qquickiconimage/tst_qquickiconimage.cpp index 91684203f7..b91262d396 100644 --- a/tests/auto/quickcontrols/qquickiconimage/tst_qquickiconimage.cpp +++ b/tests/auto/quickcontrols/qquickiconimage/tst_qquickiconimage.cpp @@ -96,7 +96,6 @@ void tst_qquickiconimage::nameBindingSourceSize() QQuickView view(testFileUrl("nameBindingSourceSize.qml")); QCOMPARE(view.status(), QQuickView::Ready); view.show(); - view.requestActivate(); QVERIFY(QTest::qWaitForWindowActive(&view)); INIT_DPR(view); @@ -172,7 +171,6 @@ void tst_qquickiconimage::sourceBindingNoSizes() view.show(); INIT_DPR(view); - view.requestActivate(); QVERIFY(QTest::qWaitForWindowActive(&view)); QQuickIconImage *iconImage = qobject_cast<QQuickIconImage*>(view.rootObject()->childItems().at(0)); @@ -195,7 +193,6 @@ void tst_qquickiconimage::sourceBindingSourceSize() QQuickView view(testFileUrl("sourceBindingSourceSize.qml")); QCOMPARE(view.status(), QQuickView::Ready); view.show(); - view.requestActivate(); QVERIFY(QTest::qWaitForWindowActive(&view)); INIT_DPR(view); @@ -227,7 +224,6 @@ void tst_qquickiconimage::sourceBindingSourceSizeWidthHeight() QQuickView view(testFileUrl("sourceBindingSourceSizeWidthHeight.qml")); QCOMPARE(view.status(), QQuickView::Ready); view.show(); - view.requestActivate(); QVERIFY(QTest::qWaitForWindowActive(&view)); INIT_DPR(view); @@ -246,7 +242,6 @@ void tst_qquickiconimage::sourceBindingSourceTooLarge() QQuickView view(testFileUrl("sourceBindingSourceTooLarge.qml")); QCOMPARE(view.status(), QQuickView::Ready); view.show(); - view.requestActivate(); QVERIFY(QTest::qWaitForWindowActive(&view)); INIT_DPR(view); @@ -284,7 +279,6 @@ void tst_qquickiconimage::alignment() QQuickView view(testFileUrl("alignment.qml")); QCOMPARE(view.status(), QQuickView::Ready); view.show(); - view.requestActivate(); QVERIFY(QTest::qWaitForWindowActive(&view)); INIT_DPR(view); @@ -359,7 +353,6 @@ void tst_qquickiconimage::svgSourceBindingSourceSize() QQuickView view(testFileUrl("svgSourceBindingSourceSize.qml")); QCOMPARE(view.status(), QQuickView::Ready); view.show(); - view.requestActivate(); QVERIFY(QTest::qWaitForWindowActive(&view)); QQuickIconImage *iconImage = qobject_cast<QQuickIconImage*>(view.rootObject()->childItems().at(0)); @@ -383,7 +376,6 @@ void tst_qquickiconimage::color() QQuickView view(testFileUrl("color.qml")); QCOMPARE(view.status(), QQuickView::Ready); view.show(); - view.requestActivate(); QVERIFY(QTest::qWaitForWindowActive(&view)); INIT_DPR(view); @@ -419,7 +411,6 @@ void tst_qquickiconimage::changeSourceSize() QQuickView view(testFileUrl("sourceBindingSourceSize.qml")); QCOMPARE(view.status(), QQuickView::Ready); view.show(); - view.requestActivate(); QVERIFY(QTest::qWaitForWindowActive(&view)); QQuickIconImage *iconImage = qobject_cast<QQuickIconImage*>(view.rootObject()->childItems().at(0)); @@ -440,7 +431,6 @@ void tst_qquickiconimage::fileSelectors() view.setSource(testFileUrl("fileSelectors.qml")); QCOMPARE(view.status(), QQuickView::Ready); view.show(); - view.requestActivate(); QVERIFY(QTest::qWaitForWindowActive(&view)); INIT_DPR(view); @@ -482,7 +472,6 @@ void tst_qquickiconimage::imageProvider() view.setSource(testFileUrl("imageProvider.qml")); QCOMPARE(view.status(), QQuickView::Ready); view.show(); - view.requestActivate(); QVERIFY(QTest::qWaitForWindowActive(&view)); QQuickIconImage *iconImage = qobject_cast<QQuickIconImage*>(view.rootObject()->findChild<QQuickIconImage *>()); |
