diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2020-06-24 22:12:09 +0200 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2020-06-26 22:40:34 +0200 |
| commit | ab1e0961d4718fb5e36e22c3b70dd98e776e0edd (patch) | |
| tree | 11186bfe2ab1a0ce25b2002d4106c84faae9f610 /tests/auto/widgets | |
| parent | b0772b41c26dc9e628df520f4e63ac9742ba88b2 (diff) | |
QFileDialog: remove deprecated mode QFileDialog::DirectoryOnly
Change-Id: Ia06e80c1bbed3e5bb80793aebd0a4780eb81a36b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'tests/auto/widgets')
| -rw-r--r-- | tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp | 5 | ||||
| -rw-r--r-- | tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp | 7 |
2 files changed, 1 insertions, 11 deletions
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index 734e98b4d5..b3b6e69c79 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -292,7 +292,6 @@ void tst_QFiledialog::filesSelectedSignal_data() QTest::newRow("any") << QFileDialog::AnyFile; QTest::newRow("existing") << QFileDialog::ExistingFile; QTest::newRow("directory") << QFileDialog::Directory; - QTest::newRow("directoryOnly") << QFileDialog::DirectoryOnly; QTest::newRow("existingFiles") << QFileDialog::ExistingFiles; } @@ -317,7 +316,7 @@ void tst_QFiledialog::filesSelectedSignal() QModelIndex file; for (int i = 0; i < listView->model()->rowCount(root); ++i) { file = listView->model()->index(i, 0, root); - if (fileMode == QFileDialog::Directory || fileMode == QFileDialog::DirectoryOnly) { + if (fileMode == QFileDialog::Directory) { if (listView->model()->hasChildren(file)) break; } else { @@ -649,8 +648,6 @@ void tst_QFiledialog::fileMode() QCOMPARE(fd.fileMode(), QFileDialog::ExistingFile); fd.setFileMode(QFileDialog::Directory); QCOMPARE(fd.fileMode(), QFileDialog::Directory); - fd.setFileMode(QFileDialog::DirectoryOnly); - QCOMPARE(fd.fileMode(), QFileDialog::DirectoryOnly); fd.setFileMode(QFileDialog::ExistingFiles); QCOMPARE(fd.fileMode(), QFileDialog::ExistingFiles); } diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp index 3cc739f621..e6130c56b1 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp @@ -1249,15 +1249,8 @@ void tst_QFileDialog2::QTBUG6558_showDirsOnly() fd.setOption(QFileDialog::ShowDirsOnly, true); QTRY_COMPARE(model->rowCount(model->index(dir.absolutePath())), 2); - - fd.setFileMode(QFileDialog::DirectoryOnly); - QTRY_COMPARE(model->rowCount(model->index(dir.absolutePath())), 2); QTRY_COMPARE(bool(fd.options() & QFileDialog::ShowDirsOnly), true); - fd.setFileMode(QFileDialog::AnyFile); - QTRY_COMPARE(model->rowCount(model->index(dir.absolutePath())), 3); - QTRY_COMPARE(bool(fd.options() & QFileDialog::ShowDirsOnly), false); - fd.setDirectory(QDir::homePath()); //We remove the dirs |