SVN commit 1201158 by dfaure: fix realPath(QString()) and realPath("/") M +3 -0 kernel/kstandarddirs.cpp M +4 -0 tests/kstandarddirstest.cpp --- trunk/KDE/kdelibs/kdecore/kernel/kstandarddirs.cpp #1201157:1201158 @@ -911,6 +911,9 @@ return strRet + QLatin1Char('/'); return strRet; #else + if (dirname.isEmpty() || (dirname.size() == 1 && dirname.at(0) == QLatin1Char('/'))) + return dirname; + char realpath_buffer[MAXPATHLEN + 1]; memset(realpath_buffer, 0, MAXPATHLEN + 1); --- trunk/KDE/kdelibs/kdecore/tests/kstandarddirstest.cpp #1201157:1201158 @@ -437,6 +437,10 @@ const QString sameSaveLoc = KGlobal::dirs()->resourceDirs("david").first(); QCOMPARE(sameSaveLoc, saveLoc); QCOMPARE(sameSaveLoc, KGlobal::dirs()->saveLocation("david")); + + // While we're here... + QCOMPARE(KStandardDirs::realPath(QString()), QString()); + QCOMPARE(KStandardDirs::realPath(QString("/")), QString("/")); #endif }