From d915432c23177a5d7f9ffd0d6899aab13ddc4c2b Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Tue, 6 May 2014 12:03:33 +0200
Subject: QFileDialog: Return empty QUrl from the static get..FileUrl()
 functions.

Task-number: QTBUG-38672
Change-Id: Idf554cd93d1a79db7c82f3165bd128fb31ead3e5
Reviewed-by: David Faure <david.faure@kdab.com>
---
 src/widgets/dialogs/qfiledialog.cpp                | 11 ++++--
 .../dialogs/qfiledialog/tst_qfiledialog.cpp        | 45 ++++++++++++++++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index bb8cdec896..6349bdc301 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -2128,6 +2128,11 @@ QString QFileDialog::getOpenFileName(QWidget *parent,
     return QString();
 }
 
+static inline QUrl dialogResultToUrl(const QString &file)
+{
+    return file.isEmpty() ? QUrl() : QUrl::fromLocalFile(file);
+}
+
 /*!
     This is a convenience static function that returns an existing file
     selected by the user. If the user presses Cancel, it returns an
@@ -2166,7 +2171,7 @@ QUrl QFileDialog::getOpenFileUrl(QWidget *parent,
     Q_UNUSED(supportedSchemes);
 
     // Falls back to local file
-    return QUrl::fromLocalFile(getOpenFileName(parent, caption, dir.toLocalFile(), filter, selectedFilter, options));
+    return dialogResultToUrl(getOpenFileName(parent, caption, dir.toLocalFile(), filter, selectedFilter, options));
 }
 
 /*!
@@ -2424,7 +2429,7 @@ QUrl QFileDialog::getSaveFileUrl(QWidget *parent,
     Q_UNUSED(supportedSchemes);
 
     // Falls back to local file
-    return QUrl::fromLocalFile(getSaveFileName(parent, caption, dir.toLocalFile(), filter, selectedFilter, options));
+    return dialogResultToUrl(getSaveFileName(parent, caption, dir.toLocalFile(), filter, selectedFilter, options));
 }
 
 /*!
@@ -2532,7 +2537,7 @@ QUrl QFileDialog::getExistingDirectoryUrl(QWidget *parent,
     Q_UNUSED(supportedSchemes);
 
     // Falls back to local file
-    return QUrl::fromLocalFile(getExistingDirectory(parent, caption, dir.toLocalFile(), options));
+    return dialogResultToUrl(getExistingDirectory(parent, caption, dir.toLocalFile(), options));
 }
 
 inline static QString _qt_get_directory(const QString &path)
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index 047df0d3f2..096658ae02 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -171,6 +171,7 @@ private slots:
     void tildeExpansion();
 #endif // QT_BUILD_INTERNAL
 #endif
+    void getFileUrl();
 
 private:
     QByteArray userSettings;
@@ -1429,5 +1430,49 @@ void tst_QFiledialog::tildeExpansion()
 #endif // QT_BUILD_INTERNAL
 #endif
 
+class DialogRejecter : public QObject
+{
+    Q_OBJECT
+public:
+    DialogRejecter()
+    {
+        QTimer *timer = new QTimer(this);
+        timer->setInterval(1000);
+        connect(timer, &QTimer::timeout, this, &DialogRejecter::rejectFileDialog);
+        timer->start();
+    }
+
+public slots:
+    void rejectFileDialog()
+    {
+        if (QWidget *w = QApplication::activeModalWidget())
+            if (QDialog *d = qobject_cast<QDialog *>(w))
+                d->reject();
+    }
+};
+
+void tst_QFiledialog::getFileUrl()
+{
+    // QTBUG-38672 , static functions should return empty Urls
+    const QFileDialog::Options options = QFileDialog::DontUseNativeDialog;
+    DialogRejecter dr;
+
+    QUrl url = QFileDialog::getOpenFileUrl(0, QStringLiteral("getOpenFileUrl"),
+                                           QUrl(), QString(), Q_NULLPTR, options);
+    QVERIFY(url.isEmpty());
+    QVERIFY(!url.isValid());
+
+    url = QFileDialog::getExistingDirectoryUrl(0, QStringLiteral("getExistingDirectoryUrl"),
+                                               QUrl(), options | QFileDialog::ShowDirsOnly);
+    QVERIFY(url.isEmpty());
+    QVERIFY(!url.isValid());
+
+    url = QFileDialog::getSaveFileUrl(0, QStringLiteral("getSaveFileUrl"),
+                                      QUrl(), QString(), Q_NULLPTR, options);
+    QVERIFY(url.isEmpty());
+    QVERIFY(!url.isValid());
+
+}
+
 QTEST_MAIN(tst_QFiledialog)
 #include "tst_qfiledialog.moc"
-- 
cgit v1.2.3