1 files changed, 15 insertions, 15 deletions

diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index ae8e4f7e04..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);
-    fd.setResolveSymlinks(false);
-    QCOMPARE(fd.resolveSymlinks(), false);
-    fd.setResolveSymlinks(true);
-    QCOMPARE(fd.resolveSymlinks(), true);
+    QCOMPARE(fd.testOption(QFileDialog::DontResolveSymlinks), false);
+    fd.setOption(QFileDialog::DontResolveSymlinks, true);
+    QCOMPARE(fd.testOption(QFileDialog::DontResolveSymlinks), true);
+    fd.setOption(QFileDialog::DontResolveSymlinks, false);
+    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
@@ -1119,7 +1119,7 @@ void tst_QFiledialog::setNameFilter()
 
     QFileDialog fd;
     fd.setNameFilters(filters);
-    fd.setNameFilterDetailsVisible(nameFilterDetailsVisible);
+    fd.setOption(QFileDialog::HideNameFilterDetails, !nameFilterDetailsVisible);
     fd.selectNameFilter(selectFilter);
     QCOMPARE(fd.selectedNameFilter(), expectedSelectedFilter);
 }