summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-10-01 18:10:17 (UTC)
committer ulf69 <ulf69>2004-10-01 18:10:17 (UTC)
commit7810fe355bd75c83bcdaed646cd1dde8d3c94fcb (patch) (unidiff)
tree7f425b9d7ba5109a289414c2903fff7c5182f700
parentae6aaaf2ec81317d275ebaabba2de188279b58cd (diff)
downloadkdepimpi-7810fe355bd75c83bcdaed646cd1dde8d3c94fcb.zip
kdepimpi-7810fe355bd75c83bcdaed646cd1dde8d3c94fcb.tar.gz
kdepimpi-7810fe355bd75c83bcdaed646cd1dde8d3c94fcb.tar.bz2
added env variables QTDIR and OPIEDIR to search for libraries.
This is a fix for pdaXROM users that have not set QPEDIR
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--microkde/kdecore/kstandarddirs.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp
index 500426b..7f2a326 100644
--- a/microkde/kdecore/kstandarddirs.cpp
+++ b/microkde/kdecore/kstandarddirs.cpp
@@ -1230,25 +1230,36 @@ void KStandardDirs::addKDEDefaults()
1230 { 1230 {
1231 QString kdedir = readEnvPath("MICROKDEDIR"); 1231 QString kdedir = readEnvPath("MICROKDEDIR");
1232 if (!kdedir.isEmpty()) 1232 if (!kdedir.isEmpty())
1233 { 1233 {
1234 kdedir = KShell::tildeExpand(kdedir); 1234 kdedir = KShell::tildeExpand(kdedir);
1235 kdedirList.append(kdedir); 1235 kdedirList.append(kdedir);
1236 } 1236 }
1237 } 1237 }
1238//US kdedirList.append(KDEDIR); 1238//US kdedirList.append(KDEDIR);
1239//US for embedded, add qtopia dir as kdedir 1239//US for embedded, add qtopia dir as kdedir
1240 1240
1241#ifndef DESKTOP_VERSION 1241#ifndef DESKTOP_VERSION
1242 kdedirList.append(readEnvPath("QPEDIR" )); 1242 QString tmp = readEnvPath("QPEDIR");
1243 if (!tmp.isEmpty())
1244 kdedirList.append(tmp);
1245
1246 tmp = readEnvPath("QTDIR");
1247 if (!tmp.isEmpty())
1248 kdedirList.append(tmp);
1249
1250 tmp = readEnvPath("OPIEDIR");
1251 if (!tmp.isEmpty())
1252 kdedirList.append(tmp);
1253
1243#endif 1254#endif
1244 1255
1245#ifdef __KDE_EXECPREFIX 1256#ifdef __KDE_EXECPREFIX
1246 QString execPrefix(__KDE_EXECPREFIX); 1257 QString execPrefix(__KDE_EXECPREFIX);
1247 if (execPrefix!="NONE") 1258 if (execPrefix!="NONE")
1248 kdedirList.append(execPrefix); 1259 kdedirList.append(execPrefix);
1249#endif 1260#endif
1250 1261
1251 QString localKdeDir; 1262 QString localKdeDir;
1252 1263
1253//US if (getuid()) 1264//US if (getuid())
1254 if (true) 1265 if (true)