summaryrefslogtreecommitdiffstats
path: root/src/plugins/platformthemes/xdgdesktopportal
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-22 01:00:26 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-22 01:00:27 +0100
commit64085d9b2f5ca45139ce582e212e0a416b9215fb (patch)
treee1f08f620753fc12ab66a09ab83229796bbe6e52 /src/plugins/platformthemes/xdgdesktopportal
parentb5c16921cca0d5ae966a36cb451ec0b322b967ed (diff)
parent1136c9849e26423f72d7a0a7a92be8c93c13d7a6 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Diffstat (limited to 'src/plugins/platformthemes/xdgdesktopportal')
-rw-r--r--src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
index 5e94d1558e..dcf52921aa 100644
--- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
+++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
@@ -48,6 +48,7 @@
#include <QDBusPendingCallWatcher>
#include <QDBusPendingReply>
+#include <QFile>
#include <QMetaType>
#include <QMimeType>
#include <QMimeDatabase>
@@ -181,10 +182,10 @@ void QXdgDesktopPortalFileDialog::openPortal()
if (d->saveFile) {
if (!d->directory.isEmpty())
- options.insert(QLatin1String("current_folder"), d->directory.toLatin1().append('\0'));
+ options.insert(QLatin1String("current_folder"), QFile::encodeName(d->directory).append('\0'));
if (!d->selectedFiles.isEmpty())
- options.insert(QLatin1String("current_file"), d->selectedFiles.first().toLatin1().append('\0'));
+ options.insert(QLatin1String("current_file"), QFile::encodeName(d->selectedFiles.first()).append('\0'));
}
// Insert filters