1 files changed, 24 insertions, 7 deletions

diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 0659053937..9b15c1fd98 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -170,6 +170,8 @@
     \value RemoveQuery  The query part of the URL (following a '?' character)
                         is removed.
     \value RemoveFragment
+    \value PreferLocalFile If the URL is a local file according to isLocalFile()
+     and contains no query or fragment, a local file path is returned.
     \value StripTrailingSlash  The trailing slash is removed if one is present.
 
     Note that the case folding rules in \l{RFC 3491}{Nameprep}, which QUrl
@@ -331,6 +333,7 @@ public:
     void clear();
 
     QByteArray toEncoded(QUrl::FormattingOptions options = QUrl::None) const;
+    bool isLocalFile() const;
 
     QAtomicInt ref;
 
@@ -3953,6 +3956,9 @@ QByteArray QUrlPrivate::toEncoded(QUrl::FormattingOptions options) const
     if (options==0x100) // private - see qHash(QUrl)
         return normalized();
 
+    if ((options & QUrl::PreferLocalFile) && isLocalFile() && !hasQuery && !hasFragment)
+        return encodedPath;
+
     QByteArray url;
 
     if (!(options & QUrl::RemoveScheme) && !scheme.isEmpty()) {
@@ -5695,9 +5701,12 @@ QString QUrl::toString(FormattingOptions options) const
 
     QString url;
 
+    const QString ourPath = path();
+    if ((options & QUrl::PreferLocalFile) && isLocalFile() && !d->hasQuery && !d->hasFragment)
+        return ourPath;
+
     if (!(options & QUrl::RemoveScheme) && !d->scheme.isEmpty())
         url += d->scheme + QLatin1Char(':');
-    QString ourPath = path();
     if ((options & QUrl::RemoveAuthority) != QUrl::RemoveAuthority) {
         bool doFileScheme = d->scheme == QLatin1String("file") && ourPath.startsWith(QLatin1Char('/'));
         QString tmp = d->authority(options);
@@ -5733,6 +5742,7 @@ QString QUrl::toString(FormattingOptions options) const
 }
 
 /*!
+    \since 5.0
     Returns a string representation of the URL.
     The output can be customized by passing flags with \a options.
 
@@ -5748,13 +5758,16 @@ QString QUrl::url(FormattingOptions options) const
 }
 
 /*!
+    \since 5.0
+
     Returns a human-displayable string representation of the URL.
     The output can be customized by passing flags with \a options.
     The option RemovePassword is always enabled, since passwords
     should never be shown back to users.
 
-    The resulting QString can be passed back to a QUrl later on,
-    but any password that was present initially will be lost.
+    With the default options, the resulting QString can be passed back
+    to a QUrl later on, but any password that was present initially will
+    be lost.
 
     \sa FormattingOptions, toEncoded(), toString()
 */
@@ -6171,6 +6184,13 @@ QString QUrl::toLocalFile() const
     return tmp;
 }
 
+bool QUrlPrivate::isLocalFile() const
+{
+    if (scheme.compare(QLatin1String("file"), Qt::CaseInsensitive) != 0)
+        return false;   // not file
+    return true;
+}
+
 /*!
     \since 4.7
     Returns true if this URL is pointing to a local file path. A URL is a
@@ -6186,10 +6206,7 @@ bool QUrl::isLocalFile() const
 {
     if (!d) return false;
     if (!QURL_HASFLAG(d->stateFlags, QUrlPrivate::Parsed)) d->parse();
-
-    if (d->scheme.compare(QLatin1String("file"), Qt::CaseInsensitive) != 0)
-        return false;   // not file
-    return true;
+    return d->isLocalFile();
 }
 
 /*!