rpms
/
qt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "another try at QUrl patch, this time not crashing on empty URLs too" 

This reverts commit f8934db9d9.

rdieter says we'll use my version of the patch.
This commit is contained in:
Kevin Kofler 2011-10-28 00:01:34 +02:00
parent f8934db9d9
commit 61f93597ce
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qt-everywhere-opensource-src-4.8.0-QUrl_toLocalFile.patch
View File

@ -7,7 +7,7 @@ diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile
// the call to isLocalFile() also ensures that we're parsed
- if (!isLocalFile())
+ // Treat URLs with no scheme as local for backward compatibility
+ if (!d || (!isLocalFile() && !d->scheme.isEmpty()))
+ if (!isLocalFile() && !d->scheme.isEmpty())
return QString();
QString tmp;

4
qt.spec
View File

@ -11,7 +11,7 @@ Summary: Qt toolkit
Name: qt
Epoch: 1
Version: 4.8.0
Release: 0.21.rc1%{?dist}
Release: 0.20.rc1%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@ -1041,7 +1041,7 @@ fi
%changelog
* Thu Oct 27 2011 Rex Dieter <rdieter@fedoraproject.org> 4.8.0-0.21.rc1
* Thu Oct 27 2011 Rex Dieter <rdieter@fedoraproject.org> 4.8.0-0.20.rc1
- restore qt-4.7-compatible behavior to QUrl.toLocalFile (#749213)
* Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.8.0-0.19.rc1