author | ulf69 <ulf69> | 2004-06-29 05:35:06 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-06-29 05:35:06 (UTC) |
commit | b863f47dbb927a54f492b70ac59f3f99202dd7ca (patch) (side-by-side diff) | |
tree | c5fffc44350972f0e7c963ea1ac98f2d5ce2dcfa /microkde/kdecore | |
parent | ed68714fca68286417778f0f5378b9f65d4acaa3 (diff) | |
download | kdepimpi-b863f47dbb927a54f492b70ac59f3f99202dd7ca.zip kdepimpi-b863f47dbb927a54f492b70ac59f3f99202dd7ca.tar.gz kdepimpi-b863f47dbb927a54f492b70ac59f3f99202dd7ca.tar.bz2 |
added Qtopia as directory to search for libraries (Qtopia/libs)
-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 @@ -43,6 +43,7 @@ #include <qfileinfo.h> #include <qstring.h> #include <qstringlist.h> +#include <qpe/qpeapplication.h> #include "kstandarddirs.h" #include "kconfig.h" @@ -350,10 +351,11 @@ QString KStandardDirs::findResourceDir( const char *type, QStringList candidates = resourceDirs(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 if(false && type != "locale") @@ -397,6 +399,7 @@ static void lookupDirectory(const QString& path, const QString &relPart, // We look for a set of files. //US DIR *dp = opendir( QFile::encodeName(path)); QDir dp(QFile::encodeName(path)); + if (!dp.exists()) return; static int iii = 0; @@ -1221,6 +1224,8 @@ void KStandardDirs::addKDEDefaults() } } //US kdedirList.append(KDEDIR); +//US for embedded, add qtopia dir as kdedir + kdedirList.append(QPEApplication::qpeDir()); #ifdef __KDE_EXECPREFIX QString execPrefix(__KDE_EXECPREFIX); |