From 745448d3eaa178ff1b7b75bdd577ad31e9177cd6 Mon Sep 17 00:00:00 2001
From: David Faure <david.faure@kdab.com>
Date: Wed, 9 Jul 2014 11:53:08 +0200
Subject: [PATCH] QFileDialog: compile with QT_NO_URL_CAST_FROM_STRING.

This is useful to detect confusions between local paths and URLs.

Change-Id: I1aa72ae10186984812691c8a1a4e843db3c85246
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 src/widgets/dialogs/qfiledialog.cpp | 2 ++
 src/widgets/dialogs/qfiledialog_p.h | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index f0dc577c0f0..e3e4a583334 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+#define QT_NO_URL_CAST_FROM_STRING
+
 #include <qvariant.h>
 #include <private/qwidgetitemdata_p.h>
 #include "qfiledialog.h"
diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h
index 632bbca5a4d..c20dd369535 100644
--- a/src/widgets/dialogs/qfiledialog_p.h
+++ b/src/widgets/dialogs/qfiledialog_p.h
@@ -369,7 +369,7 @@ inline QUrl QFileDialogPrivate::directory_sys() const
 {
     if (QPlatformFileDialogHelper *helper = platformFileDialogHelper())
         return helper->directory();
-    return QString();
+    return QUrl();
 }
 
 inline void QFileDialogPrivate::selectFile_sys(const QUrl &filename)