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

* Thu Oct 27 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.8.0-0.21.rc1 

- fix missing NULL check in the toLocalFile patch (fixes Digikam segfault)
This commit is contained in:
Kevin Kofler 2011-10-27 23:55:33 +02:00
parent 8d515ac543
commit 26b43071c0
2 changed files with 5 additions and 2 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 (!isLocalFile() && !d->scheme.isEmpty())
+ if (!isLocalFile() && (!d || !d->scheme.isEmpty()))
return QString();
QString tmp;

5
qt.spec
View File

@ -11,7 +11,7 @@ Summary: Qt toolkit
Name: qt
Epoch: 1
Version: 4.8.0
Release: 0.20.rc1%{?dist}
Release: 0.21.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,6 +1041,9 @@ fi
%changelog
* Thu Oct 27 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.8.0-0.21.rc1
- fix missing NULL check in the toLocalFile patch (fixes Digikam segfault)
* 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)