[gentoo-commits] gentoo-x86 commit in x11-libs/qt-core/files: qt-core-4.8.0-qurl-regression-fix.patch

[Alex Alexander (wired)]

wired       12/01/29 17:00:02

  Added:                qt-core-4.8.0-qurl-regression-fix.patch
  Log:
  version bump
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-libs/qt-core/files/qt-core-4.8.0-qurl-regression-fix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/files/qt-core-4.8.0-qurl-regression-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/files/qt-core-4.8.0-qurl-regression-fix.patch?rev=1.1&content-type=text/plain

Index: qt-core-4.8.0-qurl-regression-fix.patch
===================================================================
QUrl.toLocalfile regression fix (incompatible change from Qt 4.7)

http://mail.kde.org/pipermail/release-team/2011-December/005415.html
https://bugzilla.redhat.com/show_bug.cgi?id=749213
https://bugreports.qt.nokia.com/browse/QTBUG-22382

--- 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
@@ -6158,7 +6158,8 @@ QUrl QUrl::fromLocalFile(const QString &
 QString QUrl::toLocalFile() const
 {
     // 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 || !d->scheme.isEmpty()))
         return QString();
 
     QString tmp;