1 files changed, 11 insertions, 10 deletions

diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index 7edca2017d..d483df1e70 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -312,7 +312,9 @@ private slots:
     void setMaskInResizeEvent();
     void moveInResizeEvent();
 
-    void immediateRepaintAfterInvalidateBuffer();
+#ifdef QT_BUILD_INTERNAL
+    void immediateRepaintAfterInvalidateBackingStore();
+#endif
 
     void effectiveWinId();
     void effectiveWinId2();
@@ -7742,9 +7744,6 @@ void tst_QWidget::updateWhileMinimized()
 
     // Restore window.
     widget.showNormal();
-    QTest::qWait(30);
-    if (m_platform == QStringLiteral("xcb"))
-        QSKIP("QTBUG-26424");
     QTRY_COMPARE(widget.numPaintEvents, 1);
     QCOMPARE(widget.paintedRegion, QRegion(0, 0, 50, 50));
 }
@@ -8296,7 +8295,7 @@ void tst_QWidget::resizeInPaintEvent()
 
     widget.resizeInPaintEvent = true;
     // This will call resize in the paintEvent, which in turn will call
-    // invalidateBuffer() and a new update request should be posted.
+    // invalidateBackingStore() and a new update request should be posted.
     widget.repaint();
     QCOMPARE(widget.numPaintEvents, 1);
     widget.numPaintEvents = 0;
@@ -8449,7 +8448,8 @@ void tst_QWidget::moveInResizeEvent()
     QTRY_COMPARE(testWidget.geometry(), expectedGeometry);
 }
 
-void tst_QWidget::immediateRepaintAfterInvalidateBuffer()
+#ifdef QT_BUILD_INTERNAL
+void tst_QWidget::immediateRepaintAfterInvalidateBackingStore()
 {
     if (m_platform != QStringLiteral("xcb") && m_platform != QStringLiteral("windows"))
         QSKIP("We don't support immediate repaint right after show on other platforms.");
@@ -8464,7 +8464,7 @@ void tst_QWidget::immediateRepaintAfterInvalidateBuffer()
 
     // Marks the area covered by the widget as dirty in the backing store and
     // posts an UpdateRequest event.
-    qt_widget_private(widget.data())->invalidateBuffer(widget->rect());
+    qt_widget_private(widget.data())->invalidateBackingStore(widget->rect());
     QCOMPARE(widget->numPaintEvents, 0);
 
     // The entire widget is already dirty, but this time we want to update immediately
@@ -8473,6 +8473,7 @@ void tst_QWidget::immediateRepaintAfterInvalidateBuffer()
     widget->repaint();
     QCOMPARE(widget->numPaintEvents, 1);
 }
+#endif
 
 void tst_QWidget::effectiveWinId()
 {
@@ -9536,7 +9537,7 @@ QWidgetBackingStore* backingStore(QWidget &widget)
 void tst_QWidget::rectOutsideCoordinatesLimit_task144779()
 {
 #ifndef QT_NO_CURSOR
-    QApplication::setOverrideCursor(Qt::BlankCursor); //keep the cursor out of screen grabs
+    QGuiApplication::setOverrideCursor(Qt::BlankCursor); //keep the cursor out of screen grabs
 #endif
     QWidget main(nullptr, Qt::FramelessWindowHint); //don't get confused by the size of the window frame
     main.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
@@ -9574,7 +9575,7 @@ void tst_QWidget::rectOutsideCoordinatesLimit_task144779()
     QTRY_COMPARE(mainPixmap.toImage().convertToFormat(QImage::Format_RGB32),
                  correct.toImage().convertToFormat(QImage::Format_RGB32));
 #ifndef QT_NO_CURSOR
-    QApplication::restoreOverrideCursor();
+    QGuiApplication::restoreOverrideCursor();
 #endif
 }
 
@@ -9733,7 +9734,7 @@ public:
     {
         if (!static_cast<QWidgetPrivate*>(d_ptr.data())->maybeBackingStore()) {
             static_cast<QWidgetPrivate*>(d_ptr.data())->topData()->backingStoreTracker.create(this);
-            static_cast<QWidgetPrivate*>(d_ptr.data())->invalidateBuffer(this->rect());
+            static_cast<QWidgetPrivate*>(d_ptr.data())->invalidateBackingStore(this->rect());
             repaint();
         }
     }