Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

changed standard directories

Browse source
This commit is contained in:
Ivailo Monev 2014-11-19 15:24:38 +00:00
parent b99fa1400b
commit 6f8472c60a
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
kdecore/kernel/kstandarddirs.cpp
View file

@ -120,9 +120,9 @@ share/sounds
locale
share/locale
services
share/kde4/services
share/katana/services
servicetypes
share/kde4/servicetypes
share/katana/servicetypes
mime
share/mimelnk
cgi
@ -134,9 +134,9 @@ share/templates
exe
bin
module
%lib/kde4
%lib/katana
qtplugins
%lib/kde4/plugins
%lib/katana/plugins
kcfg
share/config.kcfg
emoticons
@ -175,9 +175,9 @@ static const char types_string[] =
"locale\0"
"share/locale\0"
"services\0"
"share/kde4/services\0"
"share/katana/services\0"
"servicetypes\0"
"share/kde4/servicetypes\0"
"share/katana/servicetypes\0"
"mime\0"
"share/mimelnk\0"
"cgi\0"
@ -189,9 +189,9 @@ static const char types_string[] =
"exe\0"
"bin\0"
"module\0"
"%lib/kde4\0"
"%lib/katana\0"
"qtplugins\0"
"%lib/kde4/plugins\0"
"%lib/katana/plugins\0"
"kcfg\0"
"share/config.kcfg\0"
"emoticons\0"

2
kinit/kioslave.cpp
View file

@ -85,7 +85,7 @@ int main(int argc, char **argv)
QString paths = QString::fromLocal8Bit(kdedirs);
QStringList pathlist = paths.split(';');
Q_FOREACH(const QString &path, pathlist) {
QString slave_path = path + QLatin1String("/lib/kde4/") + QFileInfo(libpath).fileName();
QString slave_path = path + QLatin1String("/lib/katana/") + QFileInfo(libpath).fileName();
qDebug("trying to load '%s'",slave_path.toLatin1().data());
lib.setFileName(slave_path);
if (lib.load() && lib.isLoaded() )