diff options
Diffstat (limited to 'tests/manual/dialogs/filedialogpanel.cpp')
| -rw-r--r-- | tests/manual/dialogs/filedialogpanel.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/tests/manual/dialogs/filedialogpanel.cpp b/tests/manual/dialogs/filedialogpanel.cpp index 9f2ae559d7..f72ab3d107 100644 --- a/tests/manual/dialogs/filedialogpanel.cpp +++ b/tests/manual/dialogs/filedialogpanel.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -326,7 +326,6 @@ void FileDialogPanel::getOpenFileNames() void FileDialogPanel::getOpenFileUrls() { -#if QT_VERSION >= 0x050000 QString selectedFilter = m_selectedNameFilter->text().trimmed(); const QList<QUrl> files = QFileDialog::getOpenFileUrls(this, tr("getOpenFileNames Qt %1").arg(QLatin1String(QT_VERSION_STR)), @@ -339,7 +338,6 @@ void FileDialogPanel::getOpenFileUrls() << "\nName filter: " << selectedFilter; QMessageBox::information(this, tr("getOpenFileNames"), result, QMessageBox::Ok); } -#endif // Qt 5 } void FileDialogPanel::getOpenFileName() @@ -359,7 +357,6 @@ void FileDialogPanel::getOpenFileName() void FileDialogPanel::getOpenFileUrl() { -#if QT_VERSION >= 0x050000 QString selectedFilter = m_selectedNameFilter->text().trimmed(); const QUrl file = QFileDialog::getOpenFileUrl(this, tr("getOpenFileUrl Qt %1").arg(QLatin1String(QT_VERSION_STR)), @@ -372,7 +369,6 @@ void FileDialogPanel::getOpenFileUrl() << "\nName filter: " << selectedFilter; QMessageBox::information(this, tr("getOpenFileName"), result, QMessageBox::Ok); } -#endif // Qt 5 } void FileDialogPanel::getSaveFileName() @@ -392,7 +388,6 @@ void FileDialogPanel::getSaveFileName() void FileDialogPanel::getSaveFileUrl() { -#if QT_VERSION >= 0x050000 QString selectedFilter = m_selectedNameFilter->text().trimmed(); const QUrl file = QFileDialog::getSaveFileUrl(this, tr("getSaveFileName Qt %1").arg(QLatin1String(QT_VERSION_STR)), @@ -405,7 +400,6 @@ void FileDialogPanel::getSaveFileUrl() << "\nName filter: " << selectedFilter; QMessageBox::information(this, tr("getSaveFileNames"), result, QMessageBox::Ok); } -#endif // Qt 5 } void FileDialogPanel::getExistingDirectory() @@ -419,14 +413,12 @@ void FileDialogPanel::getExistingDirectory() void FileDialogPanel::getExistingDirectoryUrl() { -#if QT_VERSION >= 0x050000 const QUrl dir = QFileDialog::getExistingDirectoryUrl(this, tr("getExistingDirectory Qt %1").arg(QLatin1String(QT_VERSION_STR)), currentDirectoryUrl(), options() | QFileDialog::ShowDirsOnly, allowedSchemes()); if (!dir.isEmpty()) QMessageBox::information(this, tr("getExistingDirectory"), QLatin1String("Directory: ") + dir.toString(), QMessageBox::Ok); -#endif // Qt 5 } void FileDialogPanel::restoreDefaults() @@ -473,11 +465,9 @@ void FileDialogPanel::applySettings(QFileDialog *d) const if (!filter.isEmpty()) d->selectNameFilter(filter); } else { -#if QT_VERSION >= 0x050000 d->setMimeTypeFilters(filters); if (!filter.isEmpty()) d->selectMimeTypeFilter(filter); -#endif // Qt 5 } foreach (LabelLineEdit *l, m_labelLineEdits) l->apply(d); @@ -504,14 +494,10 @@ void FileDialogPanel::accepted() Q_ASSERT(d); m_result.clear(); QDebug(&m_result).nospace() -#if QT_VERSION >= 0x050000 << "URLs: " << d->selectedUrls() << '\n' -#endif << "Files: " << d->selectedFiles() << "\nDirectory: " -#if QT_VERSION >= 0x050000 << d->directoryUrl() << ", " -#endif << d->directory().absolutePath() << "\nName filter: " << d->selectedNameFilter(); QTimer::singleShot(0, this, SLOT(showAcceptedResult())); // Avoid problems with the closing (modal) dialog as parent. |