author | ulf69 <ulf69> | 2004-10-01 18:10:17 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-10-01 18:10:17 (UTC) |
commit | 7810fe355bd75c83bcdaed646cd1dde8d3c94fcb (patch) (side-by-side diff) | |
tree | 7f425b9d7ba5109a289414c2903fff7c5182f700 /microkde/kdecore | |
parent | ae6aaaf2ec81317d275ebaabba2de188279b58cd (diff) | |
download | kdepimpi-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
-rw-r--r-- | microkde/kdecore/kstandarddirs.cpp | 13 |
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() { QString kdedir = readEnvPath("MICROKDEDIR"); if (!kdedir.isEmpty()) { kdedir = KShell::tildeExpand(kdedir); kdedirList.append(kdedir); } } //US kdedirList.append(KDEDIR); //US for embedded, add qtopia dir as kdedir #ifndef DESKTOP_VERSION - kdedirList.append(readEnvPath("QPEDIR" )); + QString tmp = readEnvPath("QPEDIR"); + if (!tmp.isEmpty()) + kdedirList.append(tmp); + + tmp = readEnvPath("QTDIR"); + if (!tmp.isEmpty()) + kdedirList.append(tmp); + + tmp = readEnvPath("OPIEDIR"); + if (!tmp.isEmpty()) + kdedirList.append(tmp); + #endif #ifdef __KDE_EXECPREFIX QString execPrefix(__KDE_EXECPREFIX); if (execPrefix!="NONE") kdedirList.append(execPrefix); #endif QString localKdeDir; //US if (getuid()) if (true) |