diff options
| author | Ken Moore <ken@pcbsd.org> | 2014-09-12 11:52:46 -0400 |
|---|---|---|
| committer | Ken Moore <ken@pcbsd.org> | 2014-09-12 11:52:46 -0400 |
| commit | c37283d9265fe33c47b1c95a5700bbf6396f1cdf (patch) | |
| tree | 4fc98296d23c829ea58f96650408dc7930e82d17 /lumina-desktop | |
| parent | Move all the OS-specific path PREFIX settings into LuminaOS so that we don't ... (diff) | |
| parent | Merge pull request #5 from mneumann/master (diff) | |
| download | lumina-c37283d9265fe33c47b1c95a5700bbf6396f1cdf.tar.gz lumina-c37283d9265fe33c47b1c95a5700bbf6396f1cdf.tar.bz2 lumina-c37283d9265fe33c47b1c95a5700bbf6396f1cdf.zip | |
Merge branch 'master' of github.com:pcbsd/lumina
Conflicts:
libLumina/LuminaXDG.cpp
Diffstat (limited to 'lumina-desktop')
| -rw-r--r-- | lumina-desktop/SettingsMenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lumina-desktop/SettingsMenu.cpp b/lumina-desktop/SettingsMenu.cpp index 1ff5fe92..6a24764c 100644 --- a/lumina-desktop/SettingsMenu.cpp +++ b/lumina-desktop/SettingsMenu.cpp @@ -18,7 +18,7 @@ SettingsMenu::SettingsMenu() : QMenu(){ act = new QAction( LXDG::findIcon("preferences-desktop",""), tr("Desktop"), this); act->setWhatsThis("lumina-config"); this->addAction(act); - #ifdef __FreeBSD__ + #if defined(__FreeBSD__) || defined(__DragonFly__) if(QFile::exists("/usr/local/bin/qtconfig-qt4")){ #endif #ifdef __linux__ |