From ab10711b862dd9fc6063cfb1049e194021e6296d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jan 14 2008 13:34:59 +0000 Subject: deprecated/upstreamed --- diff --git a/kdelibs-3.5.7-kde#146105.patch b/kdelibs-3.5.7-kde#146105.patch deleted file mode 100644 index 94dcbc5..0000000 --- a/kdelibs-3.5.7-kde#146105.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: kdecore/kcmdlineargs.cpp -=================================================================== ---- kdecore/kcmdlineargs.cpp (Revision 669593) -+++ kdecore/kcmdlineargs.cpp (Revision 669594) -@@ -1248,21 +1248,22 @@ - - KURL KCmdLineArgs::makeURL(const char *_urlArg) - { -- QString urlArg = QFile::decodeName(_urlArg); -- if (!QDir::isRelativePath(urlArg)) -- { -+ const QString urlArg = QFile::decodeName(_urlArg); -+ QFileInfo fileInfo(urlArg); -+ if (!fileInfo.isRelative()) { // i.e. starts with '/', on unix - KURL result; - result.setPath(urlArg); - return result; // Absolute path. - } - -- if ( !KURL::isRelativeURL(urlArg) ) -- return KURL(urlArg); // Argument is a URL -+ if ( KURL::isRelativeURL(urlArg) || fileInfo.exists() ) { -+ KURL result; -+ result.setPath( cwd()+'/'+urlArg ); -+ result.cleanPath(); -+ return result; // Relative path -+ } - -- KURL result; -- result.setPath( cwd()+"/"+urlArg ); -- result.cleanPath(); -- return result; // Relative path -+ return KURL(urlArg); // Argument is a URL - } - - void