aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2022-03-03 16:47:11 +0800
committerMitch Curtis <mitch.curtis@qt.io>2022-03-08 01:19:43 +0800
commit3849e0de268bc8c579769b7770b98a07c2c21d0c (patch)
tree517266e6b6b68d7fba90e5f6e32a909b32c8c27d
parent0e4444a74a4259ec0871ec95d3804a0bbaf3b30f (diff)
Fix selectedFiles being empty for native FileDialogs
This code was mistakenly removed in 13399bd54d084ed837ec061ca9315dbd173f3b48. Change-Id: Ibbae3fb51e324df0991123c8a083537e1bf76745 Fixes: QTBUG-101170 Pick-to: 6.3 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
-rw-r--r--src/quickdialogs2/quickdialogs2/qquickfiledialog.cpp9
-rw-r--r--src/quickdialogs2/quickdialogs2/qquickfiledialog_p.h1
2 files changed, 10 insertions, 0 deletions
diff --git a/src/quickdialogs2/quickdialogs2/qquickfiledialog.cpp b/src/quickdialogs2/quickdialogs2/qquickfiledialog.cpp
index b74ace9aca..da899140b7 100644
--- a/src/quickdialogs2/quickdialogs2/qquickfiledialog.cpp
+++ b/src/quickdialogs2/quickdialogs2/qquickfiledialog.cpp
@@ -581,6 +581,15 @@ QUrl QQuickFileDialog::addDefaultSuffix(const QUrl &file) const
return url;
}
+void QQuickFileDialog::accept()
+{
+ if (QPlatformFileDialogHelper *fileDialog = qobject_cast<QPlatformFileDialogHelper *>(handle())) {
+ // Take the currently selected files and make them the final set of files.
+ setSelectedFiles(fileDialog->selectedFiles());
+ }
+ QQuickAbstractDialog::accept();
+}
+
QList<QUrl> QQuickFileDialog::addDefaultSuffixes(const QList<QUrl> &files) const
{
QList<QUrl> urls;
diff --git a/src/quickdialogs2/quickdialogs2/qquickfiledialog_p.h b/src/quickdialogs2/quickdialogs2/qquickfiledialog_p.h
index ef86e11133..1d1a0e82d1 100644
--- a/src/quickdialogs2/quickdialogs2/qquickfiledialog_p.h
+++ b/src/quickdialogs2/quickdialogs2/qquickfiledialog_p.h
@@ -146,6 +146,7 @@ protected:
void onCreate(QPlatformDialogHelper *dialog) override;
void onShow(QPlatformDialogHelper *dialog) override;
void onHide(QPlatformDialogHelper *dialog) override;
+ void accept() override;
private:
QUrl addDefaultSuffix(const QUrl &file) const;