kdelibs/kdelibs-4.6.80-kstandarddir...

27 lines
1.5 KiB
Diff
Raw Normal View History

2011-05-27 12:57:55 +00:00
diff -up kdelibs-4.6.80/kdecore/kernel/kstandarddirs.cpp.kstandarddirs kdelibs-4.6.80/kdecore/kernel/kstandarddirs.cpp
--- kdelibs-4.6.80/kdecore/kernel/kstandarddirs.cpp.kstandarddirs 2011-05-20 22:24:54.000000000 +0200
+++ kdelibs-4.6.80/kdecore/kernel/kstandarddirs.cpp 2011-05-27 14:33:01.445487773 +0200
@@ -1152,7 +1152,9 @@ QStringList KStandardDirs::KStandardDirs
pit != prefixList->end();
++pit)
{
2011-05-27 12:57:55 +00:00
- if((*pit)!=installprefix||installdir.isEmpty())
+ // "exe" never has a custom install path, and the check triggers
+ // a false positive due to the libexecdir patch
+ if((*pit)!=installprefix||installdir.isEmpty()||!strcmp("exe", type))
{
2008-11-20 10:22:49 +00:00
for (QStringList::ConstIterator it = dirs.constBegin();
it != dirs.constEnd(); ++it)
2011-05-27 12:57:55 +00:00
@@ -1170,6 +1172,11 @@ QStringList KStandardDirs::KStandardDirs
if ((local || testdir.exists()) && !candidates.contains(path))
candidates.append(path);
}
+ // special-case "config" (forward porting Chris Cheney's
+ // hack) - we want /etc/kde after the local config paths
+ // and before the ones in /usr (including kde-profile)
+ if (local && !strcmp("config", type))
2011-05-27 12:57:55 +00:00
+ candidates.append(QLatin1String("/etc/kde/"));
local = false;
}
2011-05-27 12:57:55 +00:00
else