QtWidgets tests: Replace qFindChild{ren} with QObject::findChild{ren}

Change-Id: I79a26387bcce0d7f79f4f9f70293e97dae52f949
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

10 files changed, 48 insertions, 48 deletions

diff --git a/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp
index 1d4a022aaf..14a8496b42 100644
--- a/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp
+++ b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp
@@ -183,24 +183,24 @@ void tst_QCalendarWidget::buttonClickCheck()
     QDate selectedDate(2005, 1, 1);
     //click on the month buttons
     int month = object.monthShown();
-    QToolButton *button = qFindChild<QToolButton *>(&object, "qt_calendar_prevmonth");
+    QToolButton *button = object.findChild<QToolButton *>("qt_calendar_prevmonth");
     QTest::mouseClick(button, Qt::LeftButton);
 	QCOMPARE(month > 1 ? month-1 : 12, object.monthShown());
-    button = qFindChild<QToolButton *>(&object, "qt_calendar_nextmonth");
+    button = object.findChild<QToolButton *>("qt_calendar_nextmonth");
     QTest::mouseClick(button, Qt::LeftButton);
     QCOMPARE(month, object.monthShown());
 
-    button = qFindChild<QToolButton *>(&object, "qt_calendar_yearbutton");
+    button = object.findChild<QToolButton *>("qt_calendar_yearbutton");
     QTest::mouseClick(button, Qt::LeftButton, Qt::NoModifier, button->rect().center(), 2);
     QVERIFY(!button->isVisible());
-    QSpinBox *spinbox = qFindChild<QSpinBox *>(&object, "qt_calendar_yearedit");
+    QSpinBox *spinbox = object.findChild<QSpinBox *>("qt_calendar_yearedit");
     QTest::qWait(500);
     QTest::keyClick(spinbox, '2');
     QTest::keyClick(spinbox, '0');
     QTest::keyClick(spinbox, '0');
     QTest::keyClick(spinbox, '6');
     QTest::qWait(500);
-    QWidget *widget = qFindChild<QWidget *>(&object, "qt_calendar_calendarview");
+    QWidget *widget = object.findChild<QWidget *>("qt_calendar_calendarview");
     QTest::mouseMove(widget);
     QTest::mouseClick(widget, Qt::LeftButton);
     QCOMPARE(2006, object.yearShown());
@@ -212,11 +212,11 @@ void tst_QCalendarWidget::buttonClickCheck()
     object.setDateRange(QDate(2006,1,1), QDate(2006,2,28));
     object.setSelectedDate(QDate(2006,1,1));
     object.showSelectedDate();
-    button = qFindChild<QToolButton *>(&object, "qt_calendar_prevmonth");
+    button = object.findChild<QToolButton *>("qt_calendar_prevmonth");
     QTest::mouseClick(button, Qt::LeftButton);
     QCOMPARE(1, object.monthShown());
 
-    button = qFindChild<QToolButton *>(&object, "qt_calendar_nextmonth");
+    button = object.findChild<QToolButton *>("qt_calendar_nextmonth");
     QTest::mouseClick(button, Qt::LeftButton);
     QCOMPARE(2, object.monthShown());
     QTest::mouseClick(button, Qt::LeftButton);
@@ -351,7 +351,7 @@ void tst_QCalendarWidget::showPrevNext()
 
     // QTBUG-4058
     QTest::qWait(20);
-    QToolButton *button = qFindChild<QToolButton *>(&calWidget, "qt_calendar_prevmonth");
+    QToolButton *button = calWidget.findChild<QToolButton *>("qt_calendar_prevmonth");
     QTest::mouseClick(button, Qt::LeftButton);
     expectedDate = expectedDate.addMonths(-1);
     QCOMPARE(calWidget.yearShown(), expectedDate.year());
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index df53093e20..7c468fcaed 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -2064,10 +2064,10 @@ void tst_QComboBox::task190351_layout()
     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());
     }
@@ -2201,7 +2201,7 @@ void tst_QComboBox::task248169_popupWithMinimalSize()
     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
diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
index 53c3eb1ed0..bfffa357a8 100644
--- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -2818,7 +2818,7 @@ void tst_QDateTimeEdit::calendarPopup()
     opt.subControls = QStyle::SC_ComboBoxArrow;
     QRect rect = style->subControlRect(QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxArrow, testWidget);
     QTest::mouseClick(testWidget, Qt::LeftButton, 0, QPoint(rect.left()+rect.width()/2, rect.top()+rect.height()/2));
-    QWidget *wid = qFindChild<QWidget *>(testWidget, "qt_datetimedit_calendar");
+    QWidget *wid = testWidget->findChild<QWidget *>("qt_datetimedit_calendar");
     QVERIFY(wid != 0);
     testWidget->hide();
 
@@ -2830,7 +2830,7 @@ void tst_QDateTimeEdit::calendarPopup()
     opt.subControls = QStyle::SC_ComboBoxArrow;
     rect = style->subControlRect(QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxArrow, &timeEdit);
     QTest::mouseClick(&timeEdit, Qt::LeftButton, 0, QPoint(rect.left()+rect.width()/2, rect.top()+rect.height()/2));
-    QWidget *wid2 = qFindChild<QWidget *>(&timeEdit, "qt_datetimedit_calendar");
+    QWidget *wid2 = timeEdit.findChild<QWidget *>("qt_datetimedit_calendar");
     QVERIFY(wid2 == 0);
     timeEdit.hide();
 
@@ -2844,7 +2844,7 @@ void tst_QDateTimeEdit::calendarPopup()
     opt.subControls = QStyle::SC_ComboBoxArrow;
     rect = style->subControlRect(QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxArrow, &dateEdit);
     QTest::mouseClick(&dateEdit, Qt::LeftButton, 0, QPoint(rect.left()+rect.width()/2, rect.top()+rect.height()/2));
-    QWidget *wid3 = qFindChild<QWidget *>(&dateEdit, "qt_datetimedit_calendar");
+    QWidget *wid3 = dateEdit.findChild<QWidget *>("qt_datetimedit_calendar");
     QVERIFY(wid3 == 0);
     dateEdit.hide();
 }
diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
index 59be9bd659..b0e454b643 100644
--- a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
+++ b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
@@ -265,7 +265,7 @@ void tst_QDialogButtonBox::addButton1()
     QPushButton *button = new QPushButton();
     buttonBox.addButton(button, role);
     QTEST(buttonBox.buttons().count(), "totalCount");
-    QList<QAbstractButton *> children = qFindChildren<QAbstractButton *>(&buttonBox);
+    QList<QAbstractButton *> children = buttonBox.findChildren<QAbstractButton *>();
     QTEST(children.count(), "totalCount");
     delete button;
 }
@@ -292,7 +292,7 @@ void tst_QDialogButtonBox::addButton2()
     QCOMPARE(buttonBox.buttons().count(), 0);
     buttonBox.addButton(text, role);
     QTEST(buttonBox.buttons().count(), "totalCount");
-    QList<QAbstractButton *> children = qFindChildren<QAbstractButton *>(&buttonBox);
+    QList<QAbstractButton *> children = buttonBox.findChildren<QAbstractButton *>();
     QTEST(children.count(), "totalCount");
 }
 
@@ -319,7 +319,7 @@ void tst_QDialogButtonBox::addButton3()
     QCOMPARE(buttonBox.buttons().count(), 0);
     buttonBox.addButton(button);
     QTEST(buttonBox.buttons().count(), "totalCount");
-    QList<QAbstractButton *> children = qFindChildren<QAbstractButton *>(&buttonBox);
+    QList<QAbstractButton *> children = buttonBox.findChildren<QAbstractButton *>();
     QTEST(children.count(), "totalCount");
 }
 
@@ -341,7 +341,7 @@ void tst_QDialogButtonBox::clear()
         buttonBox.addButton("Happy", QDialogButtonBox::ButtonRole(i));
     buttonBox.clear();
     QCOMPARE(buttonBox.buttons().count(), 0);
-    QList<QAbstractButton *> children = qFindChildren<QAbstractButton *>(&buttonBox);
+    QList<QAbstractButton *> children = buttonBox.findChildren<QAbstractButton *>();
     QCOMPARE(children.count(), 0);
 }
 
@@ -376,11 +376,11 @@ void tst_QDialogButtonBox::testDelete()
     QPushButton *deleteMe = new QPushButton("Happy");
     buttonBox.addButton(deleteMe, QDialogButtonBox::HelpRole);
     QCOMPARE(buttonBox.buttons().count(), 1);
-    QList<QAbstractButton *> children = qFindChildren<QAbstractButton *>(&buttonBox);
+    QList<QAbstractButton *> children = buttonBox.findChildren<QAbstractButton *>();
     QCOMPARE(children.count(), 1);
 
     delete deleteMe;
-    children = qFindChildren<QAbstractButton *>(&buttonBox);
+    children = buttonBox.findChildren<QAbstractButton *>();
     QCOMPARE(children.count(), 0);
     QCOMPARE(buttonBox.buttons().count(), 0);
 }
diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
index 896d4e8e6f..b42bfcac81 100644
--- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
@@ -731,7 +731,7 @@ void tst_QMainWindow::statusBar()
         // deleting the status bar should remove it from the main window
         QMainWindow mw;
         QStatusBar *sb = mw.statusBar();
-        QMainWindowLayout *l = qFindChild<QMainWindowLayout *>(&mw);
+        QMainWindowLayout *l = mw.findChild<QMainWindowLayout *>();
         QVERIFY(l);
         int indexOfSb = l->indexOf(sb);
         QVERIFY(indexOfSb != -1);
@@ -1425,7 +1425,7 @@ void AddDockWidget::apply(QMainWindow *mw) const
 
     QDockWidget *other = 0;
     if (mode == SplitMode || mode == TabMode) {
-        other = qFindChild<QDockWidget*>(mw, this->other);
+        other = mw->findChild<QDockWidget*>(this->other);
         QVERIFY(other != 0);
     }
 
@@ -1463,14 +1463,14 @@ Q_DECLARE_METATYPE(MoveList)
 
 void MoveSeparator::apply(QMainWindow *mw) const
 {
-    QMainWindowLayout *l = qFindChild<QMainWindowLayout *>(mw);
+    QMainWindowLayout *l = mw->findChild<QMainWindowLayout *>();
     QVERIFY(l);
 
     QList<int> path;
     if (name.isEmpty()) {
         path << area;
     } else {
-        QDockWidget *dw = qFindChild<QDockWidget*>(mw, name);
+        QDockWidget *dw = mw->findChild<QDockWidget*>(name);
         QVERIFY(dw != 0);
         path = l->layoutState.dockAreaLayout.indexOf(dw);
     }
@@ -1488,7 +1488,7 @@ void MoveSeparator::apply(QMainWindow *mw) const
 QMap<QString, QRect> dockWidgetGeometries(QMainWindow *mw)
 {
     QMap<QString, QRect> result;
-    QList<QDockWidget*> dockWidgets = qFindChildren<QDockWidget*>(mw);
+    QList<QDockWidget*> dockWidgets = mw->findChildren<QDockWidget*>();
     foreach (QDockWidget *dw, dockWidgets)
         result.insert(dw->objectName(), dw->geometry());
     return result;
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
index 72945a9fd2..6364a736cd 100644
--- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
@@ -111,7 +111,7 @@ static bool tabBetweenSubWindowsIn(QMdiArea *mdiArea, int tabCount = -1, bool re
         if (tabCount > 1)
             QTest::qWait(500);
         if (walkThrough) {
-            QRubberBand *rubberBand = qFindChild<QRubberBand *>(mdiArea->viewport());
+            QRubberBand *rubberBand = mdiArea->viewport()->findChild<QRubberBand *>();
             if (!rubberBand) {
                 qWarning("No rubber band");
                 return false;
@@ -2334,14 +2334,14 @@ void tst_QMdiArea::setViewMode()
 
     // Default.
     QVERIFY(!activeSubWindow->isMaximized());
-    QTabBar *tabBar = qFindChild<QTabBar *>(&mdiArea);
+    QTabBar *tabBar = mdiArea.findChild<QTabBar *>();
     QVERIFY(!tabBar);
     QCOMPARE(mdiArea.viewMode(), QMdiArea::SubWindowView);
 
     // Tabbed view.
     mdiArea.setViewMode(QMdiArea::TabbedView);
     QCOMPARE(mdiArea.viewMode(), QMdiArea::TabbedView);
-    tabBar = qFindChild<QTabBar *>(&mdiArea);
+    tabBar = mdiArea.findChild<QTabBar *>();
     QVERIFY(tabBar);
     QVERIFY(tabBar->isVisible());
 
@@ -2408,7 +2408,7 @@ void tst_QMdiArea::setViewMode()
     // Go back to default (QMdiArea::SubWindowView).
     mdiArea.setViewMode(QMdiArea::SubWindowView);
     QVERIFY(!activeSubWindow->isMaximized());
-    tabBar = qFindChild<QTabBar *>(&mdiArea);
+    tabBar = mdiArea.findChild<QTabBar *>();
     QVERIFY(!tabBar);
     QCOMPARE(mdiArea.viewMode(), QMdiArea::SubWindowView);
 }
@@ -2422,14 +2422,14 @@ void tst_QMdiArea::setTabsClosable()
     QCOMPARE(mdiArea.tabsClosable(), false);
 
     // change value before tab bar exists
-    QTabBar *tabBar = qFindChild<QTabBar *>(&mdiArea);
+    QTabBar *tabBar = mdiArea.findChild<QTabBar *>();
     QVERIFY(!tabBar);
     mdiArea.setTabsClosable(true);
     QCOMPARE(mdiArea.tabsClosable(), true);
 
     // force tab bar creation
     mdiArea.setViewMode(QMdiArea::TabbedView);
-    tabBar = qFindChild<QTabBar *>(&mdiArea);
+    tabBar = mdiArea.findChild<QTabBar *>();
     QVERIFY(tabBar);
 
     // value must've been propagated
@@ -2452,14 +2452,14 @@ void tst_QMdiArea::setTabsMovable()
     QCOMPARE(mdiArea.tabsMovable(), false);
 
     // change value before tab bar exists
-    QTabBar *tabBar = qFindChild<QTabBar *>(&mdiArea);
+    QTabBar *tabBar = mdiArea.findChild<QTabBar *>();
     QVERIFY(!tabBar);
     mdiArea.setTabsMovable(true);
     QCOMPARE(mdiArea.tabsMovable(), true);
 
     // force tab bar creation
     mdiArea.setViewMode(QMdiArea::TabbedView);
-    tabBar = qFindChild<QTabBar *>(&mdiArea);
+    tabBar = mdiArea.findChild<QTabBar *>();
     QVERIFY(tabBar);
 
     // value must've been propagated
@@ -2500,7 +2500,7 @@ void tst_QMdiArea::setTabShape()
 
     mdiArea.setViewMode(QMdiArea::TabbedView);
 
-    QTabBar *tabBar = qFindChild<QTabBar *>(&mdiArea);
+    QTabBar *tabBar = mdiArea.findChild<QTabBar *>();
     QVERIFY(tabBar);
     QCOMPARE(tabBar->shape(), QTabBar::TriangularNorth);
 
@@ -2543,7 +2543,7 @@ void tst_QMdiArea::setTabPosition()
     // Default.
     QCOMPARE(mdiArea.tabPosition(), QTabWidget::North);
     mdiArea.setViewMode(QMdiArea::TabbedView);
-    QTabBar *tabBar = qFindChild<QTabBar *>(&mdiArea);
+    QTabBar *tabBar = mdiArea.findChild<QTabBar *>();
     QVERIFY(tabBar);
     QCOMPARE(tabBar->shape(), QTabBar::RoundedNorth);
 
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
index 477bab8a37..5b146cf443 100644
--- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
+++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
@@ -598,7 +598,7 @@ void tst_QMdiSubWindow::showShaded()
     QWidget *mouseReceiver = 0;
 #ifdef Q_OS_MAC
     if (window->style()->inherits("QMacStyle"))
-        mouseReceiver = qFindChild<QSizeGrip *>(window);
+        mouseReceiver = window->findChild<QSizeGrip *>();
     else
 #endif
         mouseReceiver = window;
@@ -707,7 +707,7 @@ void tst_QMdiSubWindow::setOpaqueResizeAndMove()
 
     QWidget *mouseReceiver = 0;
     if (window->style()->inherits("QMacStyle"))
-        mouseReceiver = qFindChild<QSizeGrip *>(window);
+        mouseReceiver = window->findChild<QSizeGrip *>();
     else
         mouseReceiver = window;
     QVERIFY(mouseReceiver);
@@ -1447,12 +1447,12 @@ void tst_QMdiSubWindow::defaultSizeGrip()
     // QSizeGrip on windows with decoration.
     QMdiSubWindow *windowWithDecoration = mdiArea.addSubWindow(new QWidget);
     windowWithDecoration->show();
-    QVERIFY(qFindChild<QSizeGrip *>(windowWithDecoration));
+    QVERIFY(windowWithDecoration->findChild<QSizeGrip *>());
 
     // ...but not on windows without decoration (Qt::FramelessWindowHint).
     QMdiSubWindow *windowWithoutDecoration = mdiArea.addSubWindow(new QWidget, Qt::FramelessWindowHint);
     windowWithoutDecoration->show();
-    QVERIFY(!qFindChild<QSizeGrip *>(windowWithoutDecoration));
+    QVERIFY(!windowWithoutDecoration->findChild<QSizeGrip *>());
 }
 #endif
 
diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
index fdb17d1eaf..11c4e238ec 100644
--- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
+++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
@@ -1119,7 +1119,7 @@ void tst_QPlainTextEdit::mimeDataReimplementations()
     QCOMPARE(ed.insertCallCount, 0);
 
 #ifdef QT_BUILD_INTERNAL
-    QWidgetTextControl *control = qFindChild<QWidgetTextControl *>(&ed);
+    QWidgetTextControl *control = ed.findChild<QWidgetTextControl *>();
     QVERIFY(control);
 
     control->canInsertFromMimeData(QApplication::clipboard()->mimeData());
diff --git a/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp
index 62dfd07f3e..3bdf583153 100644
--- a/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp
+++ b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp
@@ -175,7 +175,7 @@ void tst_QStatusBar::setSizeGripEnabled()
     QVERIFY(QTest::qWaitForWindowExposed(&mainWindow));
 
     QTRY_VERIFY(statusBar->isVisible());
-    QPointer<QSizeGrip> sizeGrip = qFindChild<QSizeGrip *>(statusBar);
+    QPointer<QSizeGrip> sizeGrip = statusBar->findChild<QSizeGrip *>();
     QVERIFY(sizeGrip);
     QVERIFY(sizeGrip->isVisible());
 
@@ -211,7 +211,7 @@ void tst_QStatusBar::setSizeGripEnabled()
     statusBar = mainWindow.statusBar();
     QVERIFY(statusBar);
 
-    sizeGrip = qFindChild<QSizeGrip *>(statusBar);
+    sizeGrip = statusBar->findChild<QSizeGrip *>();
     QVERIFY(sizeGrip);
     QVERIFY(!sizeGrip->isVisible());
 
diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
index b8ff6f1c33..11bb5c88a1 100644
--- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
@@ -1483,7 +1483,7 @@ void tst_QTextEdit::mimeDataReimplementations()
     QCOMPARE(ed.insertCallCount, 0);
 
 #ifdef QT_BUILD_INTERNAL
-    QWidgetTextControl *control = qFindChild<QWidgetTextControl *>(&ed);
+    QWidgetTextControl *control = ed.findChild<QWidgetTextControl *>();
     QVERIFY(control);
 
     control->canInsertFromMimeData(QApplication::clipboard()->mimeData());
@@ -2104,7 +2104,7 @@ void tst_QTextEdit::cursorRect()
 #ifdef QT_BUILD_INTERNAL
 void tst_QTextEdit::setDocumentPreservesPalette()
 {
-    QWidgetTextControl *control = qFindChild<QWidgetTextControl *>(ed);
+    QWidgetTextControl *control = ed->findChild<QWidgetTextControl *>();
     QVERIFY(control);
 
     QPalette defaultPal = ed->palette();