summaryrefslogtreecommitdiffabout
path: root/microkde
authorulf69 <ulf69>2004-06-29 05:35:06 (UTC)
committer ulf69 <ulf69>2004-06-29 05:35:06 (UTC)
commitb863f47dbb927a54f492b70ac59f3f99202dd7ca (patch) (side-by-side diff)
treec5fffc44350972f0e7c963ea1ac98f2d5ce2dcfa /microkde
parented68714fca68286417778f0f5378b9f65d4acaa3 (diff)
downloadkdepimpi-b863f47dbb927a54f492b70ac59f3f99202dd7ca.zip
kdepimpi-b863f47dbb927a54f492b70ac59f3f99202dd7ca.tar.gz
kdepimpi-b863f47dbb927a54f492b70ac59f3f99202dd7ca.tar.bz2
added Qtopia as directory to search for libraries (Qtopia/libs)
Diffstat (limited to 'microkde') (more/less context) (ignore whitespace changes)
-rw-r--r--microkde/kdecore/kstandarddirs.cpp9
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
@@ -42,8 +42,9 @@
#include <qdir.h>
#include <qfileinfo.h>
#include <qstring.h>
#include <qstringlist.h>
+#include <qpe/qpeapplication.h>
#include "kstandarddirs.h"
#include "kconfig.h"
#include "kdebug.h"
@@ -349,12 +350,13 @@ QString KStandardDirs::findResourceDir( const char *type,
applyDataRestrictions(filename);
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")
kdDebug() << "KStdDirs::findResDir(): can't find \"" << filename << "\" in type \"" << type << "\"." << endl;
@@ -396,8 +398,9 @@ 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;
++iii;
@@ -1220,8 +1223,10 @@ void KStandardDirs::addKDEDefaults()
kdedirList.append(kdedir);
}
}
//US kdedirList.append(KDEDIR);
+//US for embedded, add qtopia dir as kdedir
+ kdedirList.append(QPEApplication::qpeDir());
#ifdef __KDE_EXECPREFIX
QString execPrefix(__KDE_EXECPREFIX);
if (execPrefix!="NONE")