diff options
| author | Ken Moore <moorekou@gmail.com> | 2014-09-11 08:16:48 -0400 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2014-09-11 08:16:48 -0400 |
| commit | 7e7db2e99ed9eb8bd7cbf66124e61d32a4887731 (patch) | |
| tree | 54282a05934a9a3295f4d20880f687145da366c9 /libLumina | |
| parent | Update the *.desktop "Exec=" compliance to the standards as of 9/9/2014 in Lu... (diff) | |
| parent | Port Lumina to DragonFly (diff) | |
| download | lumina-7e7db2e99ed9eb8bd7cbf66124e61d32a4887731.tar.gz lumina-7e7db2e99ed9eb8bd7cbf66124e61d32a4887731.tar.bz2 lumina-7e7db2e99ed9eb8bd7cbf66124e61d32a4887731.zip | |
Merge pull request #4 from mneumann/master
Port Lumina to DragonFly
Diffstat (limited to 'libLumina')
| -rw-r--r-- | libLumina/LuminaXDG.cpp | 8 | ||||
| -rw-r--r-- | libLumina/libLumina.pro | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libLumina/LuminaXDG.cpp b/libLumina/LuminaXDG.cpp index 8d210abe..ff231034 100644 --- a/libLumina/LuminaXDG.cpp +++ b/libLumina/LuminaXDG.cpp @@ -273,7 +273,7 @@ QIcon LXDG::findIcon(QString iconName, QString fallback){ for(int i=0; i<xdd.length(); i++){ paths << xdd[i]+"/icons"; } - #ifdef __FreeBSD__ + #if defined(__FreeBSD__) || defined(__DragonFly__) paths << "/usr/local/share/pixmaps"; #endif #ifdef __linux__ @@ -291,7 +291,7 @@ QIcon LXDG::findIcon(QString iconName, QString fallback){ //Try to load the icon from /usr/local/share/pixmaps if( ico.isNull() ){ //qDebug() << "Could not find icon:" << iconName; - #ifdef __FreeBSD__ + #if defined(__FreeBSD__) || defined(__DragonFly__) QDir base("/usr/local/share/pixmaps"); #endif #ifdef __linux__ @@ -299,7 +299,7 @@ QIcon LXDG::findIcon(QString iconName, QString fallback){ #endif QStringList matches = base.entryList(QStringList() << "*"+iconName+"*", QDir::Files | QDir::NoDotAndDotDot, QDir::Name); if( !matches.isEmpty() ){ - #ifdef __FreeBSD__ + #if defined(__FreeBSD__) || defined(__DragonFly__) ico = QIcon("/usr/local/share/pixmaps/"+matches[0]); //just use the first match #endif #ifdef __linux__ @@ -309,7 +309,7 @@ QIcon LXDG::findIcon(QString iconName, QString fallback){ //Fallback on a manual search over the default theme directories (hicolor, then oxygen) if( QDir::searchPaths("fallbackicons").isEmpty() ){ //Set the fallback search paths - #ifdef __FreeBSD__ + #if defined(__FreeBSD__) || defined(__DragonFly__) QString base = "/usr/local/share/icons/"; #endif #ifdef __linux__ diff --git a/libLumina/libLumina.pro b/libLumina/libLumina.pro index 9de16637..245fe922 100644 --- a/libLumina/libLumina.pro +++ b/libLumina/libLumina.pro @@ -19,6 +19,7 @@ SOURCES += LuminaXDG.cpp \ LuminaUtils.cpp \ LuminaX11.cpp \ LuminaOS-FreeBSD.cpp \ + LuminaOS-DragonFly.cpp \ LuminaOS-Linux.cpp # new OS support can be added here |