| -rw-r--r-- | microkde/kdecore/kstandarddirs.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp index 5abe05c..1a1e027 100644 --- a/microkde/kdecore/kstandarddirs.cpp +++ b/microkde/kdecore/kstandarddirs.cpp @@ -44,4 +44,5 @@ #include <qstring.h> #include <qstringlist.h> +#include <qpe/qpeapplication.h> #include "kstandarddirs.h" @@ -351,8 +352,9 @@ QString KStandardDirs::findResourceDir( const char *type, QString fullPath; - for (QStringList::ConstIterator it = candidates.begin(); - it != candidates.end(); it++) + for (QStringList::ConstIterator it = candidates.begin(); it != candidates.end(); it++) + { if (exists(*it + filename)) return *it; + } #ifndef NDEBUG @@ -398,4 +400,5 @@ static void lookupDirectory(const QString& path, const QString &relPart, //US DIR *dp = opendir( QFile::encodeName(path)); QDir dp(QFile::encodeName(path)); + if (!dp.exists()) return; @@ -1222,4 +1225,6 @@ void KStandardDirs::addKDEDefaults() } //US kdedirList.append(KDEDIR); +//US for embedded, add qtopia dir as kdedir + kdedirList.append(QPEApplication::qpeDir()); #ifdef __KDE_EXECPREFIX |