1 files changed, 13 insertions, 6 deletions
diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp
index 5f86b511f7..74442736c3 100644
--- a/src/gui/kernel/qplatformdialoghelper.cpp
+++ b/src/gui/kernel/qplatformdialoghelper.cpp
@@ -376,9 +376,9 @@ public:
     QStringList nameFilters;
     QString defaultSuffix;
     QStringList history;
-    QString initialDirectory;
+    QUrl initialDirectory;
     QString initiallySelectedNameFilter;
-    QStringList initiallySelectedFiles;
+    QList<QUrl> initiallySelectedFiles;
 };
 
 QFileDialogOptions::QFileDialogOptions() : d(new QFileDialogOptionsPrivate)
@@ -495,6 +495,8 @@ QStringList QFileDialogOptions::nameFilters() const
 void QFileDialogOptions::setDefaultSuffix(const QString &suffix)
 {
     d->defaultSuffix = suffix;
+    if (d->defaultSuffix.size() > 1 && d->defaultSuffix.startsWith(QLatin1Char('.')))
+        d->defaultSuffix.remove(0, 1); // Silently change ".txt" -> "txt".
 }
 
 QString QFileDialogOptions::defaultSuffix() const
@@ -528,12 +530,12 @@ bool QFileDialogOptions::isLabelExplicitlySet(DialogLabel label)
     return label >= 0 && label < DialogLabelCount && !d->labels[label].isEmpty();
 }
 
-QString QFileDialogOptions::initialDirectory() const
+QUrl QFileDialogOptions::initialDirectory() const
 {
     return d->initialDirectory;
 }
 
-void QFileDialogOptions::setInitialDirectory(const QString &directory)
+void QFileDialogOptions::setInitialDirectory(const QUrl &directory)
 {
     d->initialDirectory = directory;
 }
@@ -548,16 +550,21 @@ void QFileDialogOptions::setInitiallySelectedNameFilter(const QString &filter)
     d->initiallySelectedNameFilter = filter;
 }
 
-QStringList QFileDialogOptions::initiallySelectedFiles() const
+QList<QUrl> QFileDialogOptions::initiallySelectedFiles() const
 {
     return d->initiallySelectedFiles;
 }
 
-void QFileDialogOptions::setInitiallySelectedFiles(const QStringList &files)
+void QFileDialogOptions::setInitiallySelectedFiles(const QList<QUrl> &files)
 {
     d->initiallySelectedFiles = files;
 }
 
+bool QPlatformFileDialogHelper::isSupportedUrl(const QUrl &url) const
+{
+    return url.isLocalFile();
+}
+
 /*!
     \class QPlatformFileDialogHelper
     \since 5.0