2 files changed, 21 insertions, 17 deletions

diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index 9668c82ef2..748c8aaa84 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -620,13 +620,13 @@ void tst_QFiledialog::acceptMode()
 void tst_QFiledialog::confirmOverwrite()
 {
     QFileDialog fd;
-    QCOMPARE(fd.confirmOverwrite(), true);
-    fd.setConfirmOverwrite(true);
-    QCOMPARE(fd.confirmOverwrite(), true);
-    fd.setConfirmOverwrite(false);
-    QCOMPARE(fd.confirmOverwrite(), false);
-    fd.setConfirmOverwrite(true);
-    QCOMPARE(fd.confirmOverwrite(), true);
+    QCOMPARE(fd.testOption(QFileDialog::DontConfirmOverwrite), false);
+    fd.setOption(QFileDialog::DontConfirmOverwrite, false);
+    QCOMPARE(fd.testOption(QFileDialog::DontConfirmOverwrite), false);
+    fd.setOption(QFileDialog::DontConfirmOverwrite, true);
+    QCOMPARE(fd.testOption(QFileDialog::DontConfirmOverwrite), true);
+    fd.setOption(QFileDialog::DontConfirmOverwrite, false);
+    QCOMPARE(fd.testOption(QFileDialog::DontConfirmOverwrite), false);
 }
 
 void tst_QFiledialog::defaultSuffix()
@@ -808,8 +808,8 @@ void tst_QFiledialog::isReadOnly()
     //QCOMPARE(renameAction && renameAction->isEnabled(), true);
     //QCOMPARE(deleteAction && deleteAction->isEnabled(), true);
 
-    fd.setReadOnly(true);
-    QCOMPARE(fd.isReadOnly(), true);
+    fd.setOption(QFileDialog::ReadOnly, true);
+    QCOMPARE(fd.testOption(QFileDialog::ReadOnly), true);
 
     QCOMPARE(newButton && newButton->isEnabled(), false);
     QCOMPARE(renameAction && renameAction->isEnabled(), false);
@@ -853,11 +853,11 @@ void tst_QFiledialog::resolveSymlinks()
     QFileDialog fd;
 
     // default
-    QCOMPARE(fd.resolveSymlinks(), true);
+    QCOMPARE(fd.testOption(QFileDialog::DontResolveSymlinks), false);
     fd.setOption(QFileDialog::DontResolveSymlinks, true);
-    QCOMPARE(fd.resolveSymlinks(), false);
+    QCOMPARE(fd.testOption(QFileDialog::DontResolveSymlinks), true);
     fd.setOption(QFileDialog::DontResolveSymlinks, false);
-    QCOMPARE(fd.resolveSymlinks(), true);
+    QCOMPARE(fd.testOption(QFileDialog::DontResolveSymlinks), false);
 
     // the file dialog doesn't do anything based upon this, just passes it to the model
     // the model should fully test it, don't test it here
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index 93c8b095e0..2d4d5249d2 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -321,7 +321,9 @@ private slots:
     void setMaskInResizeEvent();
     void moveInResizeEvent();
 
-    void immediateRepaintAfterInvalidateBuffer();
+#ifdef QT_BUILD_INTERNAL
+    void immediateRepaintAfterInvalidateBackingStore();
+#endif
 
     void effectiveWinId();
     void effectiveWinId2();
@@ -8215,7 +8217,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;
@@ -8370,7 +8372,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.");
@@ -8384,7 +8387,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
@@ -8393,6 +8396,7 @@ void tst_QWidget::immediateRepaintAfterInvalidateBuffer()
     widget->repaint();
     QCOMPARE(widget->numPaintEvents, 1);
 }
+#endif
 
 void tst_QWidget::effectiveWinId()
 {
@@ -9628,7 +9632,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();
         }
     }