1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index ef6a4571d9..7c468fcaed 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -2059,15 +2059,15 @@ void tst_QComboBox::task190351_layout()
     listCombo.setCurrentIndex(70);
     listCombo.showPopup();
     QTRY_VERIFY(listCombo.view());
-    QTest::qWaitForWindowShown(listCombo.view());
+    QTest::qWaitForWindowExposed(listCombo.view());
     QTRY_VERIFY(listCombo.view()->isVisible());
     QApplication::processEvents();
 
 #ifdef QT_BUILD_INTERNAL
-    QFrame *container = qFindChild<QComboBoxPrivateContainer *>(&listCombo);
+    QFrame *container = listCombo.findChild<QComboBoxPrivateContainer *>();
     QVERIFY(container);
-    QCOMPARE(static_cast<QAbstractItemView *>(list), qFindChild<QAbstractItemView *>(container));
-    QWidget *top = qFindChild<QComboBoxPrivateScroller *>(container);
+    QCOMPARE(static_cast<QAbstractItemView *>(list), container->findChild<QAbstractItemView *>());
+    QWidget *top = container->findChild<QComboBoxPrivateScroller *>();
     QVERIFY(top);
     QVERIFY(top->isVisible());
     QCOMPARE(top->mapToGlobal(QPoint(0, top->height())).y(), list->mapToGlobal(QPoint()).y());
@@ -2138,10 +2138,10 @@ void tst_QComboBox::task191329_size()
     QTRY_VERIFY(tableCombo.view()->isVisible());
 
 #ifdef QT_BUILD_INTERNAL
-    QFrame *container = qFindChild<QComboBoxPrivateContainer *>(&tableCombo);
+    QFrame *container = tableCombo.findChild<QComboBoxPrivateContainer *>();
     QVERIFY(container);
-    QCOMPARE(static_cast<QAbstractItemView *>(table), qFindChild<QAbstractItemView *>(container));
-    foreach (QWidget *button, qFindChildren<QComboBoxPrivateScroller *>(container)) {
+    QCOMPARE(static_cast<QAbstractItemView *>(table), container->findChild<QAbstractItemView *>());
+    foreach (QWidget *button, container->findChildren<QComboBoxPrivateScroller *>()) {
         //the popup should be large enough to contains everithing so the top and left button are hidden
         QVERIFY(!button->isVisible());
     }
@@ -2197,11 +2197,11 @@ void tst_QComboBox::task248169_popupWithMinimalSize()
     QTRY_VERIFY(comboBox.isVisible());
     comboBox.showPopup();
     QTRY_VERIFY(comboBox.view());
-    QTest::qWaitForWindowShown(comboBox.view());
+    QTest::qWaitForWindowExposed(comboBox.view());
     QTRY_VERIFY(comboBox.view()->isVisible());
 
 #ifdef QT_BUILD_INTERNAL
-    QFrame *container = qFindChild<QComboBoxPrivateContainer *>(&comboBox);
+    QFrame *container = comboBox.findChild<QComboBoxPrivateContainer *>();
     QVERIFY(container);
     QTRY_VERIFY(desktop.screenGeometry(container).contains(container->geometry()));
 #endif