Contents of /trunk/qt4/patches/qt-4.8.0-qurl-backward-compatibility.patch
Parent Directory | Revision Log
Revision 1668 -
(show annotations)
(download)
Fri Mar 2 19:29:32 2012 UTC (12 years, 6 months ago) by niro
File size: 713 byte(s)
Fri Mar 2 19:29:32 2012 UTC (12 years, 6 months ago) by niro
File size: 713 byte(s)
-added qt-4.8 patches
1 | diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp |
2 | --- qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile 2011-10-03 22:44:32.000000000 -0500 |
3 | +++ qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp 2011-10-27 12:58:35.706815049 -0500 |
4 | @@ -6158,7 +6158,8 @@ QUrl QUrl::fromLocalFile(const QString & |
5 | QString QUrl::toLocalFile() const |
6 | { |
7 | // the call to isLocalFile() also ensures that we're parsed |
8 | - if (!isLocalFile()) |
9 | + // Treat URLs with no scheme as local for backward compatibility |
10 | + if (!isLocalFile() && (!d || !d->scheme.isEmpty())) |
11 | return QString(); |
12 | |
13 | QString tmp; |