69835801c4
- fix #455130 (kinit crashing in kglobalconfig with no KComponentData) properly - drop revert-kinit-regression hack (fixes ioslave translations)
13 lines
829 B
Diff
13 lines
829 B
Diff
diff -ur kdelibs-4.1.0/kdecore/config/kconfiggroup.cpp kdelibs-4.1.0-#455130/kdecore/config/kconfiggroup.cpp
|
|
--- kdelibs-4.1.0/kdecore/config/kconfiggroup.cpp 2008-06-25 09:57:24.000000000 +0200
|
|
+++ kdelibs-4.1.0-#455130/kdecore/config/kconfiggroup.cpp 2008-08-29 14:48:54.000000000 +0200
|
|
@@ -393,7 +393,7 @@
|
|
|
|
QString result;
|
|
QByteArray oldpath = qgetenv( "PATH" );
|
|
- QByteArray newpath = QFile::encodeName( KGlobal::dirs()->resourceDirs( "exe" ).join( QChar( KPATH_SEPARATOR ) ) );
|
|
+ QByteArray newpath = QFile::encodeName( KGlobal::hasMainComponent() ? KGlobal::dirs()->resourceDirs( "exe" ).join( QChar( KPATH_SEPARATOR ) ) : QString() );
|
|
if( !newpath.isEmpty() && !oldpath.isEmpty() )
|
|
newpath += KPATH_SEPARATOR;
|
|
newpath += oldpath;
|