From 9fe6fcdae8a46835183e30cd47b3f06d26549901 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Thu, 22 Jan 2009 12:56:20 +0100 Subject: [PATCH] Make Quasel compile on mac and win again. Curse you evil #ifdefs!111 --- src/common/quassel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp index 50140732..d9e180e7 100644 --- a/src/common/quassel.cpp +++ b/src/common/quassel.cpp @@ -255,8 +255,8 @@ QString Quassel::configDirPath() { QSettings s(format, QSettings::UserScope, QCoreApplication::organizationDomain(), buildInfo().applicationName); QFileInfo fileInfo(s.fileName()); _configDirPath = fileInfo.dir().absolutePath(); - } #endif /* Q_WS_MAC */ + } if(!_configDirPath.endsWith(QDir::separator()) && !_configDirPath.endsWith('/')) _configDirPath += QDir::separator(); @@ -286,7 +286,7 @@ QStringList Quassel::findDataDirPaths() const { // Provide a fallback // FIXME fix this for win and mac! #ifdef Q_OS_WIN32 - dataDirNames << qgetenv("APPDATA") + QCoreApplication::organizationDomain(); + dataDirNames << qgetenv("APPDATA") + QCoreApplication::organizationDomain() << QCoreApplication::applicationDirPath(); #elif defined Q_WS_MAC dataDirNames << QDir::homePath() + "/Library/Application Support/Quassel/" -- 2.20.1