summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-06-29 05:35:06 (UTC)
committer ulf69 <ulf69>2004-06-29 05:35:06 (UTC)
commitb863f47dbb927a54f492b70ac59f3f99202dd7ca (patch) (unidiff)
treec5fffc44350972f0e7c963ea1ac98f2d5ce2dcfa
parented68714fca68286417778f0f5378b9f65d4acaa3 (diff)
downloadkdepimpi-b863f47dbb927a54f492b70ac59f3f99202dd7ca.zip
kdepimpi-b863f47dbb927a54f492b70ac59f3f99202dd7ca.tar.gz
kdepimpi-b863f47dbb927a54f492b70ac59f3f99202dd7ca.tar.bz2
added Qtopia as directory to search for libraries (Qtopia/libs)
Diffstat (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
@@ -44,4 +44,5 @@
44#include <qstring.h> 44#include <qstring.h>
45#include <qstringlist.h> 45#include <qstringlist.h>
46#include <qpe/qpeapplication.h>
46 47
47#include "kstandarddirs.h" 48#include "kstandarddirs.h"
@@ -351,8 +352,9 @@ QString KStandardDirs::findResourceDir( const char *type,
351 QString fullPath; 352 QString fullPath;
352 353
353 for (QStringList::ConstIterator it = candidates.begin(); 354 for (QStringList::ConstIterator it = candidates.begin(); it != candidates.end(); it++)
354 it != candidates.end(); it++) 355 {
355 if (exists(*it + filename)) 356 if (exists(*it + filename))
356 return *it; 357 return *it;
358 }
357 359
358#ifndef NDEBUG 360#ifndef NDEBUG
@@ -398,4 +400,5 @@ static void lookupDirectory(const QString& path, const QString &relPart,
398//US DIR *dp = opendir( QFile::encodeName(path)); 400//US DIR *dp = opendir( QFile::encodeName(path));
399 QDir dp(QFile::encodeName(path)); 401 QDir dp(QFile::encodeName(path));
402
400 if (!dp.exists()) 403 if (!dp.exists())
401 return; 404 return;
@@ -1222,4 +1225,6 @@ void KStandardDirs::addKDEDefaults()
1222 } 1225 }
1223//US kdedirList.append(KDEDIR); 1226//US kdedirList.append(KDEDIR);
1227//US for embedded, add qtopia dir as kdedir
1228 kdedirList.append(QPEApplication::qpeDir());
1224 1229
1225#ifdef __KDE_EXECPREFIX 1230#ifdef __KDE_EXECPREFIX