| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | microkde/kdecore/klibloader.cpp | 6 | ||||
| -rw-r--r-- | microkde/kdecore/kstandarddirs.cpp | 21 |
3 files changed, 24 insertions, 5 deletions
@@ -2,3 +2,3 @@ # Makefile for building: kopi-desktop -# Generated by qmake (1.07a) (Qt 3.3.2) on: Wed Jul 7 13:43:59 2004 +# Generated by qmake (1.07a) (Qt 3.3.2) on: Wed Jul 7 14:00:48 2004 # Project: kopi-desktop.pro diff --git a/microkde/kdecore/klibloader.cpp b/microkde/kdecore/klibloader.cpp index c091e05..9eee912 100644 --- a/microkde/kdecore/klibloader.cpp +++ b/microkde/kdecore/klibloader.cpp @@ -398,3 +398,6 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta //US libfile = instance->dirs()->findResource( "module", libname ); + //qDebug("libname = %s ",libname.data() ); libfile = KGlobal::dirs()->findResource( "module", libname ); + //qDebug("libfile = %s ",libfile.latin1() ); + if ( libfile.isEmpty() ) @@ -403,2 +406,3 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta libfile = KGlobal::dirs()->findResource( "lib", libname ); + //qDebug("libfile2 = %s ",libfile.latin1() ); #ifndef NDEBUG @@ -421,2 +425,4 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta } + + //qDebug("return libfile = %s ",libfile.latin1() ); return libfile; diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp index 7f51d78..e1c78f6 100644 --- a/microkde/kdecore/kstandarddirs.cpp +++ b/microkde/kdecore/kstandarddirs.cpp @@ -44,2 +44,4 @@ #include <qstring.h> +#include <qapplication.h> + #include <qstringlist.h> @@ -351,5 +353,12 @@ QString KStandardDirs::findResourceDir( const char *type, QString fullPath; - +#ifdef DESKTOP_VERSION +#ifdef _WIN32_ + candidates.prepend( qApp->applicationDirPath () +"\\"); +#else + candidates.prepend( qApp->applicationDirPath () +"/"); +#endif +#endif for (QStringList::ConstIterator it = candidates.begin(); it != candidates.end(); it++) { + //qDebug("looking for dir %s - file %s", (*it).latin1(), filename.latin1()); if (exists(*it + filename)) @@ -360,3 +369,4 @@ QString KStandardDirs::findResourceDir( const char *type, if(false && type != "locale") - kdDebug() << "KStdDirs::findResDir(): can't find \"" << filename << "\" in type \"" << type << "\"." << endl; + qDebug("KStdDirs::findResDir(): can't find %s ", filename.latin1()); + #endif @@ -971,5 +981,5 @@ QString KStandardDirs::kde_default(const char *type) { if (!strcmp(type, "lib")) - return "lib/"; + return "lib/"; if (!strcmp(type, "module")) - return "lib/kde3/"; + return "lib/kde3/"; if (!strcmp(type, "qtplugins")) @@ -1226,3 +1236,6 @@ void KStandardDirs::addKDEDefaults() //US for embedded, add qtopia dir as kdedir + +#ifndef DESKTOP_VERSION kdedirList.append(readEnvPath("QPEDIR" )); +#endif |