From 2f5c9ae576684b14bad43a3f108065c606d614b2 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 28 May 2018 10:58:27 +0200 Subject: Make sure we open native dialogs when opening folders inside sandbox We have to take obsoleted QFileDialog::DirectoryOnly file mode option into account, because it is actually used, even internally in Qt when using static QFileDialog::getExistingDirectory() method. Change-Id: I6cdd35ae4724a1d889a0fb1c3555dc3ca4f3bf4d Reviewed-by: Thiago Macieira --- src/plugins/platformthemes/flatpak/qflatpakfiledialog.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/platformthemes') diff --git a/src/plugins/platformthemes/flatpak/qflatpakfiledialog.cpp b/src/plugins/platformthemes/flatpak/qflatpakfiledialog.cpp index 6ea8242d8a..39b93bc4b8 100644 --- a/src/plugins/platformthemes/flatpak/qflatpakfiledialog.cpp +++ b/src/plugins/platformthemes/flatpak/qflatpakfiledialog.cpp @@ -291,7 +291,7 @@ QUrl QFlatpakFileDialog::directory() const { Q_D(const QFlatpakFileDialog); - if (d->nativeFileDialog && options()->fileMode() == QFileDialogOptions::Directory) + if (d->nativeFileDialog && (options()->fileMode() == QFileDialogOptions::Directory || options()->fileMode() == QFileDialogOptions::DirectoryOnly)) return d->nativeFileDialog->directory(); return d->directory; @@ -313,7 +313,7 @@ QList QFlatpakFileDialog::selectedFiles() const { Q_D(const QFlatpakFileDialog); - if (d->nativeFileDialog && options()->fileMode() == QFileDialogOptions::Directory) + if (d->nativeFileDialog && (options()->fileMode() == QFileDialogOptions::Directory || options()->fileMode() == QFileDialogOptions::DirectoryOnly)) return d->nativeFileDialog->selectedFiles(); QList files; @@ -353,7 +353,7 @@ void QFlatpakFileDialog::exec() { Q_D(QFlatpakFileDialog); - if (d->nativeFileDialog && options()->fileMode() == QFileDialogOptions::Directory) { + if (d->nativeFileDialog && (options()->fileMode() == QFileDialogOptions::Directory || options()->fileMode() == QFileDialogOptions::DirectoryOnly)) { d->nativeFileDialog->exec(); return; } @@ -382,7 +382,7 @@ bool QFlatpakFileDialog::show(Qt::WindowFlags windowFlags, Qt::WindowModality wi d->modal = windowModality != Qt::NonModal; d->winId = parent ? parent->winId() : 0; - if (d->nativeFileDialog && options()->fileMode() == QFileDialogOptions::Directory) + if (d->nativeFileDialog && (options()->fileMode() == QFileDialogOptions::Directory || options()->fileMode() == QFileDialogOptions::DirectoryOnly)) return d->nativeFileDialog->show(windowFlags, windowModality, parent); openPortal(); -- cgit v1.2.3