From 61f93597ce1f9d5c7e672b9417c5237485111ded Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Fri, 28 Oct 2011 00:01:34 +0200 Subject: [PATCH] Revert "another try at QUrl patch, this time not crashing on empty URLs too" This reverts commit f8934db9d9207507972da83c699b27187701a608. rdieter says we'll use my version of the patch. --- qt-everywhere-opensource-src-4.8.0-QUrl_toLocalFile.patch | 2 +- qt.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qt-everywhere-opensource-src-4.8.0-QUrl_toLocalFile.patch b/qt-everywhere-opensource-src-4.8.0-QUrl_toLocalFile.patch index e1971ec..a422766 100644 --- a/qt-everywhere-opensource-src-4.8.0-QUrl_toLocalFile.patch +++ b/qt-everywhere-opensource-src-4.8.0-QUrl_toLocalFile.patch @@ -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; diff --git a/qt.spec b/qt.spec index 1822a44..96f65ed 100644 --- a/qt.spec +++ b/qt.spec @@ -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 4.8.0-0.21.rc1 +* Thu Oct 27 2011 Rex Dieter 4.8.0-0.20.rc1 - restore qt-4.7-compatible behavior to QUrl.toLocalFile (#749213) * Wed Oct 26 2011 Fedora Release Engineering - 1:4.8.0-0.19.rc1